diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:16:13 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:25:39 +0200 |
| commit | 6009d338236733006e69b184bfcfab355fa81493 (patch) | |
| tree | dba220ce007e18eef94df5ea84762257e216f1fd /dbaccess/source | |
| parent | e5434c67b183b0baae675321382d41ef3cc4f4e1 (diff) | |
loplugin:salbool: Automatic rewrite of sal_False/True
Change-Id: I5cd8fd979fd4caa3d7cde599096627bfdd0dec7e
Diffstat (limited to 'dbaccess/source')
71 files changed, 260 insertions, 260 deletions
diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx index 72d435dd8e6b..01a01fa9f6ff 100644 --- a/dbaccess/source/core/api/CRowSetColumn.cxx +++ b/dbaccess/source/core/api/CRowSetColumn.cxx @@ -77,7 +77,7 @@ ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaData Sequence< Property > aRegisteredProperties; describeProperties( aRegisteredProperties ); - return new ::cppu::OPropertyArrayHelper( ::comphelper::concatSequences( aDescriptor, aRegisteredProperties ), sal_False ); + return new ::cppu::OPropertyArrayHelper( ::comphelper::concatSequences( aDescriptor, aRegisteredProperties ), false ); } ::cppu::IPropertyArrayHelper& ORowSetColumn::getInfoHelper() diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index 78f2dd72183b..72767f2bf4eb 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -94,7 +94,7 @@ ORowSetDataColumn::~ORowSetDataColumn() Sequence< Property > aRegisteredProperties; describeProperties( aRegisteredProperties ); - return new ::cppu::OPropertyArrayHelper( ::comphelper::concatSequences( aDescriptor, aRegisteredProperties ), sal_False ); + return new ::cppu::OPropertyArrayHelper( ::comphelper::concatSequences( aDescriptor, aRegisteredProperties ), false ); } // cppu::OPropertySetHelper @@ -188,7 +188,7 @@ void ORowSetDataColumn::fireValueChange(const ORowSetValue& _rOldValue) m_aOldValue = _rOldValue.makeAny(); Any aNew = value.makeAny(); - fire(&nHandle, &aNew, &m_aOldValue, 1, sal_False ); + fire(&nHandle, &aNew, &m_aOldValue, 1, false ); } } diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 97dbc1ab6135..42913cefdb1b 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -235,19 +235,19 @@ void ORowSet::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefault ) c _rDefault <<= static_cast<sal_Int32>(CommandType::COMMAND); break; case PROPERTY_ID_IGNORERESULT: - _rDefault <<= sal_False; + _rDefault <<= false; break; case PROPERTY_ID_APPLYFILTER: - _rDefault <<= sal_False; + _rDefault <<= false; break; case PROPERTY_ID_ISMODIFIED: - _rDefault <<= sal_False; + _rDefault <<= false; break; case PROPERTY_ID_ISBOOKMARKABLE: - _rDefault <<= sal_True; + _rDefault <<= true; break; case PROPERTY_ID_CANUPDATEINSERTEDROWS: - _rDefault <<= sal_True; + _rDefault <<= true; break; case PROPERTY_ID_RESULTSETTYPE: _rDefault <<= ResultSetType::SCROLL_INSENSITIVE; @@ -262,7 +262,7 @@ void ORowSet::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefault ) c _rDefault <<= static_cast<sal_Int32>(1); break; case PROPERTY_ID_ESCAPE_PROCESSING: - _rDefault <<= sal_True; + _rDefault <<= true; break; case PROPERTY_ID_MAXROWS: _rDefault <<= sal_Int32( 0 ); @@ -630,7 +630,7 @@ void ORowSet::setActiveConnection( Reference< XConnection >& _rxNewConn, bool _b // fire the event if (_bFireEvent) - fire(&nHandle, &aNewConnection, &aOldConnection, 1, sal_False); + fire(&nHandle, &aNewConnection, &aOldConnection, 1, false); // register as event listener for the new connection xComponent.set(m_xActiveConnection,UNO_QUERY); @@ -1163,7 +1163,7 @@ void ORowSet::fireRowcount() sal_Int32 nHandle = PROPERTY_ID_ROWCOUNT; Any aNew,aOld; aNew <<= nCurrentRowCount; aOld <<= m_nLastKnownRowCount; - fire(&nHandle,&aNew,&aOld,1,sal_False); + fire(&nHandle,&aNew,&aOld,1,false); m_nLastKnownRowCount = nCurrentRowCount; } if ( !m_bLastKnownRowCountFinal && ( m_bLastKnownRowCountFinal != bCurrentRowCountFinal ) ) @@ -1172,7 +1172,7 @@ void ORowSet::fireRowcount() Any aNew,aOld; aNew <<= bCurrentRowCountFinal; aOld <<= m_bLastKnownRowCountFinal; - fire(&nHandle,&aNew,&aOld,1,sal_False); + fire(&nHandle,&aNew,&aOld,1,false); m_bLastKnownRowCountFinal = bCurrentRowCountFinal; } } @@ -1249,7 +1249,7 @@ void ORowSet::impl_setDataColumnsWriteable_throw() (*aIter)->getPropertyValue(PROPERTY_ISREADONLY) >>= bReadOnly; *aReadIter = bReadOnly; - (*aIter)->setPropertyValue(PROPERTY_ISREADONLY,makeAny(sal_False)); + (*aIter)->setPropertyValue(PROPERTY_ISREADONLY,makeAny(false)); } } @@ -1662,7 +1662,7 @@ void ORowSet::impl_ensureStatement_throw() // set the result set type and concurrency try { - xStatementProps->setPropertyValue( PROPERTY_USEBOOKMARKS, makeAny( sal_True ) ); + xStatementProps->setPropertyValue( PROPERTY_USEBOOKMARKS, makeAny( true ) ); xStatementProps->setPropertyValue( PROPERTY_MAXROWS, makeAny( m_nMaxRows ) ); setStatementResultSetType( xStatementProps, m_nResultSetType, m_nResultSetConcurrency ); diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 054f1b3231a6..42dc249bcfcd 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -97,7 +97,7 @@ ORowSetBase::ORowSetBase( const Reference<XComponentContext>& _rContext, ::cppu: sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT; sal_Int32 nInitialRowCountValue = 0; - sal_Bool bInitialRowCountFinalValue( sal_False ); + sal_Bool bInitialRowCountFinalValue( false ); registerPropertyNoMember( PROPERTY_ROWCOUNT, PROPERTY_ID_ROWCOUNT, nRBT, cppu::UnoType<decltype(nInitialRowCountValue)>::get(), &nInitialRowCountValue ); registerPropertyNoMember( PROPERTY_ISROWCOUNTFINAL, PROPERTY_ID_ISROWCOUNTFINAL, nRBT, cppu::UnoType<bool>::get(), &bInitialRowCountFinalValue ); } @@ -660,7 +660,7 @@ sal_Bool SAL_CALL ORowSetBase::isFirst( ) throw(SQLException, RuntimeException, checkCache(); if ( m_bBeforeFirst || m_bAfterLast ) - return sal_False; + return false; if ( impl_rowDeleted() ) return ( m_nDeletedPosition == 1 ); @@ -685,12 +685,12 @@ sal_Bool SAL_CALL ORowSetBase::isLast( ) throw(SQLException, RuntimeException, checkCache(); if ( m_bBeforeFirst || m_bAfterLast ) - return sal_False; + return false; if ( impl_rowDeleted() ) { if ( !m_pCache->m_bRowCountFinal ) - return sal_False; + return false; else return ( m_nDeletedPosition == impl_getRowCount() ); } @@ -927,7 +927,7 @@ sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, Ru ::osl::ResettableMutexGuard aGuard( *m_pMutex ); if(!rows) - return sal_True; // in this case do nothing + return true; // in this case do nothing checkPositioningAllowed(); @@ -1112,7 +1112,7 @@ sal_Bool SAL_CALL ORowSetBase::rowUpdated( ) throw(SQLException, RuntimeExcepti checkCache(); if ( impl_rowDeleted() ) - return sal_False; + return false; return m_pCache->rowUpdated(); } @@ -1124,7 +1124,7 @@ sal_Bool SAL_CALL ORowSetBase::rowInserted( ) throw(SQLException, RuntimeExcept checkCache(); if ( impl_rowDeleted() ) - return sal_False; + return false; return m_pCache->rowInserted(); } @@ -1224,7 +1224,7 @@ void ORowSetBase::fireProperty( sal_Int32 _nProperty, bool _bNew, bool _bOld ) { Any aNew = css::uno::makeAny( _bNew ); Any aOld = css::uno::makeAny( _bOld ); - fire( &_nProperty, &aNew, &aOld, 1, sal_False ); + fire( &_nProperty, &aNew, &aOld, 1, false ); } void ORowSetBase::positionCache( CursorMoveDirection _ePrepareForDirection ) diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 3f80fc896c56..81ee85624216 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -810,7 +810,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr { xStatement.reset( Reference< XStatement >( m_xConnection->createStatement(), UNO_QUERY_THROW ) ); Reference< XPropertySet > xStatementProps( xStatement, UNO_QUERY_THROW ); - try { xStatementProps->setPropertyValue( PROPERTY_ESCAPE_PROCESSING, makeAny( sal_False ) ); } + try { xStatementProps->setPropertyValue( PROPERTY_ESCAPE_PROCESSING, makeAny( false ) ); } catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } xResMetaDataSup.set( xStatement->executeQuery( sSQL ), UNO_QUERY_THROW ); xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_QUERY_THROW ); diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx index 9f1cc3c33c95..61c4f7a5ed9d 100644 --- a/dbaccess/source/core/api/datasettings.cxx +++ b/dbaccess/source/core/api/datasettings.cxx @@ -145,7 +145,7 @@ void ODataSettings::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefau _rDefault <<= ::comphelper::getDefaultFont(); break; case PROPERTY_ID_APPLYFILTER: - _rDefault <<= sal_False; + _rDefault <<= false; break; case PROPERTY_ID_TEXTRELIEF: _rDefault <<= css::awt::FontRelief::NONE; diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index d34d729d18f4..435e99576360 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -488,7 +488,7 @@ Sequence< OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames( ) describeProperties( aBaseProperties ); Sequence< Property > aAllProperties( ::comphelper::concatSequences( aDescriptor, aBaseProperties ) ); - return new ::cppu::OPropertyArrayHelper( aAllProperties, sal_False ); + return new ::cppu::OPropertyArrayHelper( aAllProperties, false ); } // cppu::OPropertySetHelper diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index dfb7580190ce..45500ea83d66 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -247,7 +247,7 @@ void SAL_CALL OQuery::propertyChange( const PropertyChangeEvent& _rSource ) thro } } - fire(&nOwnHandle, &_rSource.NewValue, &_rSource.OldValue, 1, sal_False); + fire(&nOwnHandle, &_rSource.NewValue, &_rSource.OldValue, 1, false); } void SAL_CALL OQuery::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index c328f3a07f96..193f659b8a19 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -185,7 +185,7 @@ void SAL_CALL OQueryComposer::appendFilterByColumn( const Reference< XPropertySe m_xComposerHelper->setQuery(getQuery()); m_xComposerHelper->setFilter(OUString()); - m_xComposerHelper->appendFilterByColumn(column, sal_True, SQLFilterOperator::EQUAL); + m_xComposerHelper->appendFilterByColumn(column, true, SQLFilterOperator::EQUAL); FilterCreator aFilterCreator; aFilterCreator.append(getFilter()); diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index 9681ddc7a711..5c9f5b0b4e13 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -276,12 +276,12 @@ void OResultColumn::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const case PROPERTY_ID_ISCURRENCY: case PROPERTY_ID_ISSIGNED: { - sal_Bool bVal = sal_False; + sal_Bool bVal = false; rValue.setValue(&bVal, cppu::UnoType<bool>::get()); } break; case PROPERTY_ID_ISREADONLY: { - sal_Bool bVal = sal_True; + sal_Bool bVal = true; rValue.setValue(&bVal, cppu::UnoType<bool>::get()); } break; case PROPERTY_ID_SCALE: diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index f2688109dedb..917c7b45b607 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -216,7 +216,7 @@ sal_Bool OResultSet::convertFastPropertyValue(Any & rConvertedValue, Any & rOldV // be lazy ... rConvertedValue = rValue; getFastPropertyValue( rOldValue, nHandle ); - return sal_True; + return true; } void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index da159ace76bc..b3466dccf604 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -325,7 +325,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue PropertyChangeEvent aEvent; aEvent.Source = static_cast< cppu::OWeakObject * >( this ); - aEvent.Further = sal_False; + aEvent.Further = false; aEvent.PropertyHandle = -1; const PropertyValue* pValues = rValues.getConstArray(); @@ -594,7 +594,7 @@ void OContentHelper::impl_rename_throw(const OUString& _sNewName,bool _bNotify ) Sequence< PropertyChangeEvent > aChanges( 1 ); aChanges[0].Source = static_cast< cppu::OWeakObject * >( this ); - aChanges[0].Further = sal_False; + aChanges[0].Further = false; aChanges[0].PropertyName = PROPERTY_NAME; aChanges[0].PropertyHandle = PROPERTY_ID_NAME; aChanges[0].OldValue <<= m_pImpl->m_aProps.aTitle; diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 9df76e5252dc..34b4b5bd6927 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -474,7 +474,7 @@ void ODatabaseModelImpl::impl_construct_nothrow() *pAllowedType++ = ::cppu::UnoType<sal_Int16>::get(); *pAllowedType++ = cppu::UnoType<Sequence< Any >>::get(); - m_xSettings = PropertyBag::createWithTypes( m_aContext, aAllowedTypes, sal_False/*AllowEmptyPropertyName*/, sal_True/*AutomaticAddition*/ ); + m_xSettings = PropertyBag::createWithTypes( m_aContext, aAllowedTypes, false/*AllowEmptyPropertyName*/, true/*AutomaticAddition*/ ); // insert the default settings Reference< XPropertyContainer > xContainer( m_xSettings, UNO_QUERY_THROW ); diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx index 3857cdb1f10f..4326b22bcd01 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.cxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx @@ -105,7 +105,7 @@ sal_Bool SAL_CALL OSharedConnection::isClosed( ) throw(SQLException, RuntimeExc { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xConnection.is() ) - return sal_True; + return true; return m_xConnection->isClosed(); } diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index e05b10f34a6e..0a3666b49ea9 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -110,10 +110,10 @@ void SAL_CALL OCommandDefinition::rename( const OUString& newName ) throw (SQLEx Any aOld = makeAny(m_pImpl->m_aProps.aTitle); aGuard.clear(); Any aNew = makeAny(newName); - fire(&nHandle, &aNew, &aOld, 1, sal_True ); + fire(&nHandle, &aNew, &aOld, 1, true ); m_pImpl->m_aProps.aTitle = newName; - fire(&nHandle, &aNew, &aOld, 1, sal_False ); + fire(&nHandle, &aNew, &aOld, 1, false ); } catch(const PropertyVetoException&) { diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index f624600cc88f..0a59b428aa26 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -143,7 +143,7 @@ namespace dbaccess { Reference< util::XCloseable > xClose( xMod, UNO_QUERY_THROW ); - xClose->close( sal_False ); + xClose->close( false ); } } catch( const CloseVetoException& ) diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index ad56a86342fb..3e398a9071cb 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -630,7 +630,7 @@ sal_Bool SAL_CALL ODatabaseDocument::wasModifiedSinceLastSave() throw ( RuntimeE // However, the API definition explicitly allows to be that sloppy ... if ( isModified() ) - return sal_True; + return true; // auto recovery is an "UI feature", it is to restore the UI the user knows. Thus, // we ask our connected controllers, not simply our existing form/report definitions. @@ -646,7 +646,7 @@ sal_Bool SAL_CALL ODatabaseDocument::wasModifiedSinceLastSave() throw ( RuntimeE ) { if ( lcl_hasAnyModifiedSubComponent_throw( *ctrl ) ) - return sal_True; + return true; } } catch( const Exception& ) @@ -654,7 +654,7 @@ sal_Bool SAL_CALL ODatabaseDocument::wasModifiedSinceLastSave() throw ( RuntimeE DBG_UNHANDLED_EXCEPTION(); } - return sal_False; + return false; } void SAL_CALL ODatabaseDocument::storeToRecoveryFile( const OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException, std::exception ) @@ -886,7 +886,7 @@ void SAL_CALL ODatabaseDocument::disconnectController( const Reference< XControl // #i51157# try { - close( sal_True ); + close( true ); } catch( const CloseVetoException& ) { diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 9bd46bf35bef..c7d3b4370735 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -185,7 +185,7 @@ OAuthenticationContinuation::OAuthenticationContinuation() sal_Bool SAL_CALL OAuthenticationContinuation::canSetRealm( ) throw(RuntimeException, std::exception) { - return sal_False; + return false; } void SAL_CALL OAuthenticationContinuation::setRealm( const OUString& /*Realm*/ ) throw(RuntimeException, std::exception) @@ -207,7 +207,7 @@ void SAL_CALL OAuthenticationContinuation::setUserName( const OUString& _rUser ) sal_Bool SAL_CALL OAuthenticationContinuation::canSetPassword( ) throw(RuntimeException, std::exception) { - return sal_True; + return true; } void SAL_CALL OAuthenticationContinuation::setPassword( const OUString& _rPassword ) throw(RuntimeException, std::exception) @@ -229,7 +229,7 @@ void SAL_CALL OAuthenticationContinuation::setRememberPassword( RememberAuthenti sal_Bool SAL_CALL OAuthenticationContinuation::canSetAccount( ) throw(RuntimeException, std::exception) { - return sal_False; + return false; } void SAL_CALL OAuthenticationContinuation::setAccount( const OUString& ) throw(RuntimeException, std::exception) @@ -1059,8 +1059,8 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const // the request AuthenticationRequest aRequest; aRequest.ServerName = sServerName; - aRequest.HasRealm = aRequest.HasAccount = sal_False; - aRequest.HasUserName = aRequest.HasPassword = sal_True; + aRequest.HasRealm = aRequest.HasAccount = false; + aRequest.HasUserName = aRequest.HasPassword = true; aRequest.UserName = m_pImpl->m_sUser; aRequest.Password = m_pImpl->m_sFailedPassword.isEmpty() ? m_pImpl->m_aPassword : m_pImpl->m_sFailedPassword; OInteractionRequest* pRequest = new OInteractionRequest(makeAny(aRequest)); diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index ad11290dbcbb..aaff380002a4 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -746,9 +746,9 @@ void SAL_CALL ODocumentContainer::rename( const OUString& newName ) throw (SQLEx Any aNew = makeAny(newName); aGuard.clear(); - fire(&nHandle, &aNew, &aOld, 1, sal_True ); + fire(&nHandle, &aNew, &aOld, 1, true ); m_pImpl->m_aProps.aTitle = newName; - fire(&nHandle, &aNew, &aOld, 1, sal_False ); + fire(&nHandle, &aNew, &aOld, 1, false ); } catch(const PropertyVetoException&) { diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index ea409eb0bd74..9eefaffbd9b7 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -452,7 +452,7 @@ void ODocumentDefinition::closeObject() { Reference< css::util::XCloseable> xCloseable(m_xEmbeddedObject,UNO_QUERY); if ( xCloseable.is() ) - xCloseable->close(sal_True); + xCloseable->close(true); } catch(const Exception&) { @@ -728,12 +728,12 @@ void ODocumentDefinition::impl_initFormEditView( const Reference< XController >& LayoutManagerLock aLockLayout( _rxController ); // setting of the visual properties - xViewSettings->setPropertyValue("ShowRulers",makeAny(sal_True)); - xViewSettings->setPropertyValue("ShowVertRuler",makeAny(sal_True)); - xViewSettings->setPropertyValue("ShowHoriRuler",makeAny(sal_True)); - xViewSettings->setPropertyValue("IsRasterVisible",makeAny(sal_True)); - xViewSettings->setPropertyValue("IsSnapToRaster",makeAny(sal_True)); - xViewSettings->setPropertyValue("ShowOnlineLayout",makeAny(sal_True)); + xViewSettings->setPropertyValue("ShowRulers",makeAny(true)); + xViewSettings->setPropertyValue("ShowVertRuler",makeAny(true)); + xViewSettings->setPropertyValue("ShowHoriRuler",makeAny(true)); + xViewSettings->setPropertyValue("IsRasterVisible",makeAny(true)); + xViewSettings->setPropertyValue("IsSnapToRaster",makeAny(true)); + xViewSettings->setPropertyValue("ShowOnlineLayout",makeAny(true)); xViewSettings->setPropertyValue("RasterSubdivisionX",makeAny(sal_Int32(5))); xViewSettings->setPropertyValue("RasterSubdivisionY",makeAny(sal_Int32(5))); } @@ -1201,7 +1201,7 @@ void ODocumentDefinition::onCommandInsert( const OUString& _sURL, const Referenc { Reference< css::util::XCloseable> xCloseable(m_xEmbeddedObject,UNO_QUERY); if ( xCloseable.is() ) - xCloseable->close(sal_True); + xCloseable->close(true); } catch(const Exception&) { @@ -2005,7 +2005,7 @@ bool ODocumentDefinition::prepareClose() // document has not yet been activated, i.e. has no UI, yet return true; - bool bCouldSuspend = xController->suspend( sal_True ); + bool bCouldSuspend = xController->suspend( true ); if ( !bCouldSuspend ) // controller vetoed the closing return false; @@ -2022,7 +2022,7 @@ bool ODocumentDefinition::prepareClose() { if ( bCouldSuspend ) // revert suspension - xController->suspend( sal_False ); + xController->suspend( false ); // saving failed or was cancelled return false; } diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index 50a58f3d116e..ad00847c8c8e 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -142,7 +142,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& URL,const Sequence<PropertyValu { if ( aNewArgs[nInd].Name == "SaveTo" ) { - aNewArgs[nInd].Value <<= sal_True; + aNewArgs[nInd].Value <<= true; break; } nInd++; @@ -152,7 +152,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& URL,const Sequence<PropertyValu { aNewArgs.realloc( nInd + 1 ); aNewArgs[nInd].Name = "SaveTo"; - aNewArgs[nInd].Value <<= sal_True; + aNewArgs[nInd].Value <<= true; } Reference< XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch(URL, "_self", 0 ); @@ -215,8 +215,8 @@ void SAL_CALL OInterceptor::addStatusListener( FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[DISPATCH_SAVEAS]; aStateEvent.FeatureDescriptor = "SaveCopyTo"; - aStateEvent.IsEnabled = sal_True; - aStateEvent.Requery = sal_False; + aStateEvent.IsEnabled = true; + aStateEvent.Requery = false; aStateEvent.State <<= OUString("($3)"); Control->statusChanged(aStateEvent); } @@ -234,8 +234,8 @@ void SAL_CALL OInterceptor::addStatusListener( FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[DISPATCH_SAVE]; aStateEvent.FeatureDescriptor = "Update"; - aStateEvent.IsEnabled = sal_True; - aStateEvent.Requery = sal_False; + aStateEvent.IsEnabled = true; + aStateEvent.Requery = false; Control->statusChanged(aStateEvent); { @@ -257,8 +257,8 @@ void SAL_CALL OInterceptor::addStatusListener( FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i]; aStateEvent.FeatureDescriptor = "Close and Return"; - aStateEvent.IsEnabled = sal_True; - aStateEvent.Requery = sal_False; + aStateEvent.IsEnabled = true; + aStateEvent.Requery = false; Control->statusChanged(aStateEvent); diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index 8efb513ba073..da6557b230b3 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -166,24 +166,24 @@ sal_Bool SAL_CALL DatabaseDataProvider::createDataSourcePossible(const uno::Sequ css::chart::ChartDataRowSource eRowSource = css::chart::ChartDataRowSource_COLUMNS; pArgIter->Value >>= eRowSource; if ( eRowSource != css::chart::ChartDataRowSource_COLUMNS ) - return sal_False; + return false; } else if ( pArgIter->Name == "CellRangeRepresentation" ) { OUString sRange; pArgIter->Value >>= sRange; if ( sRange != "all" ) - return sal_False; + return false; } else if ( pArgIter->Name == "FirstCellAsLabel" ) { bool bFirstCellAsLabel = true; pArgIter->Value >>= bFirstCellAsLabel; if ( !bFirstCellAsLabel ) - return sal_False; + return false; } } - return sal_True; + return true; } uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::createDataSource(const uno::Sequence< beans::PropertyValue > & _aArguments) throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception) @@ -205,7 +205,7 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat } ::comphelper::NamedValueCollection aArgs( _aArguments ); - const bool bHasCategories = aArgs.getOrDefault( "HasCategories", sal_True ); + const bool bHasCategories = aArgs.getOrDefault( "HasCategories", true ); uno::Sequence< OUString > aColumnNames = aArgs.getOrDefault( "ColumnDescriptions", uno::Sequence< OUString >() ); @@ -229,7 +229,7 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat if ( xIni.is() ) { uno::Sequence< uno::Any > aInitArgs(1); - beans::NamedValue aParam("CreateDefaultData",uno::makeAny(sal_True)); + beans::NamedValue aParam("CreateDefaultData",uno::makeAny(true)); aInitArgs[0] <<= aParam; xIni->initialize(aInitArgs); } @@ -245,7 +245,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArgum aArguments.put( "CellRangeRepresentation", uno::Any( OUString( "all" ) ) ); aArguments.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) ); // internal data always contains labels - aArguments.put( "FirstCellAsLabel", uno::makeAny( sal_True ) ); + aArguments.put( "FirstCellAsLabel", uno::makeAny( true ) ); bool bHasCategories = false; if( _xDataSource.is()) @@ -275,7 +275,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArgum sal_Bool SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentationPossible(const OUString & /*aRangeRepresentation*/) throw (uno::RuntimeException, std::exception) { - return sal_True; + return true; } uno::Any DatabaseDataProvider::impl_getNumberFormatKey_nothrow(const OUString & _sRangeRepresentation) const diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index a3f8039d8a6f..ebd05ab9203b 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -251,31 +251,31 @@ OUString ODsnTypeCollection::getJavaDriverClass(const OUString& _sURL) const bool ODsnTypeCollection::isFileSystemBased(const OUString& _sURL) const { const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL); - return aFeatures.getOrDefault("FileSystemBased",sal_False); + return aFeatures.getOrDefault("FileSystemBased",false); } bool ODsnTypeCollection::supportsTableCreation(const OUString& _sURL) const { const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL); - return aFeatures.getOrDefault("SupportsTableCreation",sal_False); + return aFeatures.getOrDefault("SupportsTableCreation",false); } bool ODsnTypeCollection::supportsColumnDescription(const OUString& _sURL) const { const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL); - return aFeatures.getOrDefault("SupportsColumnDescription",sal_False); + return aFeatures.getOrDefault("SupportsColumnDescription",false); } bool ODsnTypeCollection::supportsBrowsing(const OUString& _sURL) const { const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL); - return aFeatures.getOrDefault("SupportsBrowsing",sal_False); + return aFeatures.getOrDefault("SupportsBrowsing",false); } bool ODsnTypeCollection::supportsDBCreation(const OUString& _sURL) const { const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL); - return aFeatures.getOrDefault("SupportsDBCreation",sal_False); + return aFeatures.getOrDefault("SupportsDBCreation",false); } Sequence<PropertyValue> ODsnTypeCollection::getDefaultDBSettings( const OUString& _sURL ) const diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index 3c647eafade0..814a2504256c 100644 --- a/dbaccess/source/core/recovery/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -196,7 +196,7 @@ namespace dbaccess return; } - xModify->setModified( sal_True ); + xModify->setModified( true ); } } diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx index 25fc14e21933..b22b4b374764 100644 --- a/dbaccess/source/core/recovery/subcomponentloader.cxx +++ b/dbaccess/source/core/recovery/subcomponentloader.cxx @@ -82,7 +82,7 @@ namespace dbaccess const Reference< XController > xController( i_rData.xNonDocComponent, UNO_QUERY_THROW ); const Reference< XFrame > xFrame( xController->getFrame(), UNO_SET_THROW ); const Reference< XWindow > xWindow( xFrame->getContainerWindow(), UNO_SET_THROW ); - xWindow->setVisible( sal_True ); + xWindow->setVisible( true ); } } catch( const Exception& ) diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index e090c0678571..9b807b1006d9 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -448,7 +448,7 @@ namespace dbmm aDocumentArgs.put( "SalvagedFile", m_pData->sSuccessfulBackupLocation ); // reset the modified flag of the document, so the controller can be suspended later Reference< XModifiable > xModify( m_pData->xDocument, UNO_QUERY_THROW ); - xModify->setModified( sal_False ); + xModify->setModified( false ); // after this reload, don't show the migration warning, again aDocumentArgs.put( "SuppressMigrationWarning", true ); } @@ -473,7 +473,7 @@ namespace dbmm Reference< XFrame > xFrame( xController->getFrame(), UNO_SET_THROW ); OUString sViewName( xController->getViewControllerName() ); - if ( !xController->suspend( sal_True ) ) + if ( !xController->suspend( true ) ) { // ouch. There shouldn't be any modal dialogs and such, so there // really is no reason why suspending shouldn't work. OSL_FAIL( "MacroMigrationDialog::impl_reloadDocument_nothrow: could not suspend a controller!" ); @@ -536,7 +536,7 @@ namespace dbmm if ( !_bMigrationSuccess ) { Reference< XModifiable > xModify( m_pData->xDocument, UNO_QUERY_THROW ); - xModify->setModified( sal_True ); + xModify->setModified( true ); // this is just paranoia - in case saving the doc fails, perhaps the user is tempted to do so Reference< XStorable > xStor( m_pData->xDocument, UNO_QUERY_THROW ); xStor->store(); @@ -556,7 +556,7 @@ namespace dbmm try { Reference< XCloseable > xFrameClose( aView.first, UNO_QUERY_THROW ); - xFrameClose->close( sal_True ); + xFrameClose->close( true ); } catch( const Exception& ) { diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index ce5b7167d478..54689a16d830 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -377,7 +377,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU { // first check if preview is true, if so return with out creating a controller. Preview is not supported ::comphelper::NamedValueCollection aMediaDesc( rArgs ); - bool bPreview = aMediaDesc.getOrDefault( "Preview", sal_False ); + bool bPreview = aMediaDesc.getOrDefault( "Preview", false ); if ( bPreview ) { if (rListener.is()) diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx index 9b03217ccd05..80d2377d3e77 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.cxx +++ b/dbaccess/source/filter/xml/xmlDataSource.cxx @@ -169,26 +169,26 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport, if ( !bFoundTableNameLengthLimited && ( _eUsedFor == eAppSettings ) ) { aProperty.Name = INFO_ALLOWLONGTABLENAMES; - aProperty.Value <<= sal_True; + aProperty.Value <<= true; rImport.addInfo(aProperty); } if ( !bFoundParamNameSubstitution && ( _eUsedFor == eDriverSettings ) ) { aProperty.Name = INFO_PARAMETERNAMESUBST; - aProperty.Value <<= sal_True; + aProperty.Value <<= true; rImport.addInfo(aProperty); } if ( !bFoundAppendTableAliasName && ( _eUsedFor == eAppSettings ) ) { aProperty.Name = INFO_APPEND_TABLE_ALIAS; - aProperty.Value <<= sal_True; + aProperty.Value <<= true; rImport.addInfo(aProperty); } if ( !bFoundSuppressVersionColumns && ( _eUsedFor == eAppSettings ) ) { try { - xDataSource->setPropertyValue(PROPERTY_SUPPRESSVERSIONCL,makeAny(sal_True)); + xDataSource->setPropertyValue(PROPERTY_SUPPRESSVERSIONCL,makeAny(true)); } catch(const Exception&) { diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx index c32d74c9984e..376dab7485da 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx @@ -100,7 +100,7 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport if ( bAutoEnabled ) { aProperty.Name = INFO_AUTORETRIEVEENABLED; - aProperty.Value <<= sal_True; + aProperty.Value <<= true; rImport.addInfo(aProperty); } if ( rImport.isNewFormat() ) diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 2f1e97aa564d..dcc8f767116a 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -357,7 +357,7 @@ bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) { uno::Reference< XModifiable > xModi(GetModel(),UNO_QUERY); if ( xModi.is() ) - xModi->setModified(sal_False); + xModi->setModified(false); } else { diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index 16871550e676..4c43f959d9c4 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -84,9 +84,9 @@ public: const OUString* pSupported = aSupported.getConstArray(); \ for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported) \ if (pSupported->equals(_rServiceName)) \ - return sal_True; \ + return true; \ \ - return sal_False; \ + return false; \ } \ #define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \ diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx index 04c04f267e4c..f47331a2a8c6 100644 --- a/dbaccess/source/sdbtools/connection/tablename.cxx +++ b/dbaccess/source/sdbtools/connection/tablename.cxx @@ -124,7 +124,7 @@ namespace sdbtools Reference< XPropertySet > xTable; try { - xTable.set( xTables->getByName( getComposedName( CompositionType::Complete, sal_False ) ), UNO_QUERY_THROW ); + xTable.set( xTables->getByName( getComposedName( CompositionType::Complete, false ) ), UNO_QUERY_THROW ); } catch( const WrappedTargetException& ) { diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 13a03c5e85d4..0edefc62da4f 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -512,14 +512,14 @@ sal_Bool SAL_CALL OApplicationController::suspend(sal_Bool bSuspend) throw( Runt ::osl::MutexGuard aGuard( getMutex() ); if ( getView() && getView()->IsInModalMode() ) - return sal_False; + return false; bool bCanSuspend = true; if ( m_bSuspended != bool(bSuspend) ) { if ( bSuspend && !closeSubComponents() ) - return sal_False; + return false; Reference<XModifiable> xModi(m_xModel,UNO_QUERY); Reference<XStorable> xStor(getModel(),UNO_QUERY); @@ -1213,7 +1213,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa eType = E_QUERY; break; case ID_NEW_QUERY_DESIGN: - aCreationArgs.put( OUString(PROPERTY_GRAPHICAL_DESIGN), sal_True ); + aCreationArgs.put( OUString(PROPERTY_GRAPHICAL_DESIGN), true ); // run through case ID_NEW_QUERY_SQL: eType = E_QUERY; @@ -2584,7 +2584,7 @@ void OApplicationController::OnFirstControllerConnected() // If the migration just happened, but was not successful, the document is reloaded. // In this case, we should not show the warning, again. ::comphelper::NamedValueCollection aModelArgs( m_xModel->getArgs() ); - if ( aModelArgs.getOrDefault( "SuppressMigrationWarning", sal_False ) ) + if ( aModelArgs.getOrDefault( "SuppressMigrationWarning", false ) ) return; // also, if the document is read-only, then no migration is possible, and the @@ -2626,14 +2626,14 @@ sal_Bool SAL_CALL OApplicationController::attachModel(const Reference< XModel > if ( ( !xOfficeDoc.is() || !xDocModify.is() ) && _rxModel.is() ) { OSL_FAIL( "OApplicationController::attachModel: invalid model!" ); - return sal_False; + return false; } if ( m_xModel.is() && ( m_xModel != _rxModel ) && ( _rxModel.is() ) ) { OSL_ENSURE( false, "OApplicationController::attachModel: missing implementation: setting a new model while we have another one!" ); // we'd need to completely update our view here, close sub components, and the like - return sal_False; + return false; } const OUString aPropertyNames[] = @@ -2705,7 +2705,7 @@ sal_Bool SAL_CALL OApplicationController::attachModel(const Reference< XModel > } } - return sal_True; + return true; } void OApplicationController::containerFound( const Reference< XContainer >& _xContainer) @@ -2763,7 +2763,7 @@ sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection ) throw if ( !_aSelection.hasValue() || !getView() ) { getContainer()->selectElements(aSelection); - return sal_True; + return true; } // BEGIN compatibility @@ -2790,7 +2790,7 @@ sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection ) throw m_aSelectContainerEvent.CancelCall(); // just in case the async select request was running getContainer()->selectContainer(eType); getContainer()->selectElements(aSelection); - return sal_True; + return true; } // END compatibility @@ -2871,7 +2871,7 @@ sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection ) throw m_aSelectContainerEvent.CancelCall(); // just in case the async select request was running getContainer()->selectContainer( eSelectedCategory ); - return sal_True; + return true; } Any SAL_CALL OApplicationController::getSelection( ) throw (RuntimeException, std::exception) diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 822ca0ce7bec..3c96e67237ec 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -228,7 +228,7 @@ void OAppDetailPageHelper::dispose() { Reference< ::util::XCloseable> xCloseable(m_xFrame,UNO_QUERY); if ( xCloseable.is() ) - xCloseable->close(sal_True); + xCloseable->close(true); } catch(const Exception&) { @@ -1110,10 +1110,10 @@ void OAppDetailPageHelper::showPreview( const OUString& _sDataSourceName, pDispatcher->setTargetFrame( Reference<XFrame>(m_xFrame,UNO_QUERY_THROW) ); ::comphelper::NamedValueCollection aArgs; - aArgs.put( "Preview", sal_True ); - aArgs.put( "ReadOnly", sal_True ); - aArgs.put( "AsTemplate", sal_False ); - aArgs.put( OUString(PROPERTY_SHOWMENU), sal_False ); + aArgs.put( "Preview", true ); + aArgs.put( "ReadOnly", true ); + aArgs.put( "AsTemplate", false ); + aArgs.put( OUString(PROPERTY_SHOWMENU), false ); Reference< XController > xPreview( pDispatcher->openExisting( makeAny( _sDataSourceName ), _sName, aArgs ), UNO_QUERY ); bool bClearPreview = !xPreview.is(); diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index 9bcbc5c715ea..64d58c2c0a60 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -294,14 +294,14 @@ namespace dbaui // suspend the controller in the document if ( xController.is() ) - if ( !xController->suspend( sal_True ) ) + if ( !xController->suspend( true ) ) return false; bool bSuccess = false; try { Reference< XCloseable > xCloseable( _rComponent.xFrame, UNO_QUERY_THROW ); - xCloseable->close( sal_True ); + xCloseable->close( true ); bSuccess = true; } catch( const Exception& ) diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 302ae2fca9c2..b1367fcfe201 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1300,7 +1300,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const css::form::DatabasePa { // not my data source -> allow anything SAL_WARN("dbaccess.ui","SbaXDataBrowserController::approveParameter : invalid event source !"); - return sal_True; + return true; } Reference< css::container::XIndexAccess > xParameters = aEvent.Parameters; @@ -1329,7 +1329,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const css::form::DatabasePa if (!pParamValues->wasSelected()) { // canceled setLoadingCancelled(); - return sal_False; + return false; } // transfer the values into the parameter supplier @@ -1338,7 +1338,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const css::form::DatabasePa { SAL_WARN("dbaccess.ui","SbaXDataBrowserController::approveParameter: the InteractionHandler returned nonsense!"); setLoadingCancelled(); - return sal_False; + return false; } const PropertyValue* pFinalValues = aFinalValues.getConstArray(); for (sal_Int32 i=0; i<aFinalValues.getLength(); ++i, ++pFinalValues) @@ -1366,12 +1366,12 @@ sal_Bool SbaXDataBrowserController::approveParameter(const css::form::DatabasePa DBG_UNHANDLED_EXCEPTION(); } - return sal_True; + return true; } sal_Bool SbaXDataBrowserController::approveReset(const css::lang::EventObject& /*rEvent*/) throw( RuntimeException, std::exception ) { - return sal_True; + return true; } void SbaXDataBrowserController::resetted(const css::lang::EventObject& rEvent) throw( RuntimeException, std::exception ) @@ -1384,9 +1384,9 @@ void SbaXDataBrowserController::resetted(const css::lang::EventObject& rEvent) t sal_Bool SbaXDataBrowserController::confirmDelete(const css::sdb::RowChangeEvent& /*aEvent*/) throw( RuntimeException, std::exception ) { if (ScopedVclPtrInstance<MessageDialog>::Create(getBrowserView(), ModuleRes(STR_QUERY_BRW_DELETE_ROWS), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO)->Execute() != RET_YES) - return sal_False; + return false; - return sal_True; + return true; } FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const @@ -2053,7 +2053,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property if ( bHaving ) { HANDLE_SQL_ERRORS( - xParser->appendHavingClauseByColumn(xField,sal_True,nOp), + xParser->appendHavingClauseByColumn(xField,true,nOp), bParserSuccess, ModuleRes(SBA_BROWSER_SETTING_FILTER).toString(), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" @@ -2062,7 +2062,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property else { HANDLE_SQL_ERRORS( - xParser->appendFilterByColumn(xField,sal_True,nOp), + xParser->appendFilterByColumn(xField,true,nOp), bParserSuccess, ModuleRes(SBA_BROWSER_SETTING_FILTER).toString(), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" @@ -2461,7 +2461,7 @@ void SbaXDataBrowserController::LoadFinished(bool /*bWasSynch*/) } // switch the control to alive mode - getBrowserView()->getGridControl()->setDesignMode(sal_False); + getBrowserView()->getGridControl()->setDesignMode(false); initializeParser(); diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index 148e428bc170..dec8db487258 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -89,11 +89,11 @@ void UnoDataBrowserView::Construct(const Reference< css::awt::XControlModel >& x m_xGrid = new SbaXGridControl( getORB() ); OSL_ENSURE(m_xGrid.is(), "UnoDataBrowserView::Construct : could not create a grid control !"); // in design mode (for the moment) - m_xGrid->setDesignMode(sal_True); + m_xGrid->setDesignMode(true); Reference< css::awt::XWindow > xGridWindow(m_xGrid, UNO_QUERY); - xGridWindow->setVisible(sal_True); - xGridWindow->setEnable(sal_True); + xGridWindow->setVisible(true); + xGridWindow->setEnable(true); // introduce the model to the grid m_xGrid->setModel(xModel); diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index 72f27a2d5a3a..2d74d33f3945 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -191,8 +191,8 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU if ( sComponentURL == URL_COMPONENT_DATASOURCEBROWSER ) { - bool bDisableBrowser = !aLoadArgs.getOrDefault( "ShowTreeViewButton", sal_True ) // compatibility name - || !aLoadArgs.getOrDefault( PROPERTY_ENABLE_BROWSER, sal_True ); + bool bDisableBrowser = !aLoadArgs.getOrDefault( "ShowTreeViewButton", true ) // compatibility name + || !aLoadArgs.getOrDefault( PROPERTY_ENABLE_BROWSER, true ); if ( bDisableBrowser ) { @@ -210,7 +210,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU if ( sComponentURL == URL_COMPONENT_REPORTDESIGN ) { - bool bPreview = aLoadArgs.getOrDefault( "Preview", sal_False ); + bool bPreview = aLoadArgs.getOrDefault( "Preview", false ); if ( bPreview ) { // report designs cannot be previewed if ( rListener.is() ) diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index e840504dcf34..2773e27f878b 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -335,7 +335,7 @@ void SbaExternalSourceBrowser::Attach(const Reference< XRowSet > & xMaster) { // switch the control to design mode if (getBrowserView() && getBrowserView()->getGridControl().is()) - getBrowserView()->getGridControl()->setDesignMode(sal_True); + getBrowserView()->getGridControl()->setDesignMode(true); // the grid will move the form's cursor to the first record, but we want the form to remain unchanged // restore the old position diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index 48bd33bf13dd..2ba33e9a4b85 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -239,7 +239,7 @@ sal_Bool SAL_CALL SbaXFormAdapter::wasNull() throw( css::sdbc::SQLException, Run Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->wasNull(); - return sal_True; + return true; } OUString SAL_CALL SbaXFormAdapter::getString(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) @@ -255,7 +255,7 @@ sal_Bool SAL_CALL SbaXFormAdapter::getBoolean(sal_Int32 columnIndex) throw( css: Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getBoolean(columnIndex); - return sal_False; + return false; } sal_Int8 SAL_CALL SbaXFormAdapter::getByte(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) @@ -409,7 +409,7 @@ sal_Bool SAL_CALL SbaXFormAdapter::moveToBookmark(const Any& bookmark) throw( cs Reference< css::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->moveToBookmark(bookmark); - return sal_False; + return false; } sal_Bool SAL_CALL SbaXFormAdapter::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw( css::sdbc::SQLException, RuntimeException, std::exception ) @@ -417,7 +417,7 @@ sal_Bool SAL_CALL SbaXFormAdapter::moveRelativeToBookmark(const Any& bookmark, s Reference< css::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->moveRelativeToBookmark(bookmark,rows); - return sal_False; + return false; } sal_Int32 SAL_CALL SbaXFormAdapter::compareBookmarks(const Any& _first, const Any& _second) throw( css::sdbc::SQLException, RuntimeException, std::exception ) @@ -433,7 +433,7 @@ sal_Bool SAL_CALL SbaXFormAdapter::hasOrderedBookmarks() throw( css::sdbc::SQLEx Reference< css::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->hasOrderedBookmarks(); - return sal_False; + return false; } sal_Int32 SAL_CALL SbaXFormAdapter::hashBookmark(const Any& bookmark) throw( css::sdbc::SQLException, RuntimeException, std::exception ) @@ -569,35 +569,35 @@ sal_Bool SAL_CALL SbaXFormAdapter::next() throw( css::sdbc::SQLException, Runtim { if (m_xMainForm.is()) return m_xMainForm->next(); - return sal_False; + return false; } sal_Bool SAL_CALL SbaXFormAdapter::isBeforeFirst() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->isBeforeFirst(); - return sal_False; + return false; } sal_Bool SAL_CALL SbaXFormAdapter::isAfterLast() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->isAfterLast(); - return sal_False; + return false; } sal_Bool SAL_CALL SbaXFormAdapter::isFirst() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->isFirst(); - return sal_False; + return false; } sal_Bool SAL_CALL SbaXFormAdapter::isLast() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->isLast(); - return sal_False; + return false; } void SAL_CALL SbaXFormAdapter::beforeFirst() throw( css::sdbc::SQLException, RuntimeException, std::exception ) @@ -616,14 +616,14 @@ sal_Bool SAL_CALL SbaXFormAdapter::first() throw( css::sdbc::SQLException, Runti { if (m_xMainForm.is()) return m_xMainForm->first(); - return sal_False; + return false; } sal_Bool SAL_CALL SbaXFormAdapter::last() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->last(); - return sal_False; + return false; } sal_Int32 SAL_CALL SbaXFormAdapter::getRow() throw( css::sdbc::SQLException, RuntimeException, std::exception ) @@ -637,21 +637,21 @@ sal_Bool SAL_CALL SbaXFormAdapter::absolute(sal_Int32 row) throw( css::sdbc::SQL { if (m_xMainForm.is()) return m_xMainForm->absolute(row); - return sal_False; + return false; } sal_Bool SAL_CALL SbaXFormAdapter::relative(sal_Int32 rows) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->relative(rows); - return sal_False; + return false; } sal_Bool SAL_CALL SbaXFormAdapter::previous() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->previous(); - return sal_False; + return false; } void SAL_CALL SbaXFormAdapter::refreshRow() throw( css::sdbc::SQLException, RuntimeException, std::exception ) @@ -664,21 +664,21 @@ sal_Bool SAL_CALL SbaXFormAdapter::rowUpdated() throw( css::sdbc::SQLException, { if (m_xMainForm.is()) return m_xMainForm->rowUpdated(); - return sal_False; + return false; } sal_Bool SAL_CALL SbaXFormAdapter::rowInserted() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->rowInserted(); - return sal_False; + return false; } sal_Bool SAL_CALL SbaXFormAdapter::rowDeleted() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->rowDeleted(); - return sal_False; + return false; } Reference< XInterface > SAL_CALL SbaXFormAdapter::getStatement() throw( css::sdbc::SQLException, RuntimeException, std::exception ) @@ -807,7 +807,7 @@ sal_Bool SAL_CALL SbaXFormAdapter::isLoaded() throw( RuntimeException, std::exce Reference< css::form::XLoadable > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->isLoaded(); - return sal_False; + return false; } IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, form, LoadListener, m_aLoadListeners, css::form::XLoadable, m_xMainForm) @@ -1022,7 +1022,7 @@ IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, form, SubmitListener, m_aSubm sal_Bool SAL_CALL SbaXFormAdapter::getGroupControl() throw( RuntimeException, std::exception ) { OSL_FAIL("SAL_CALL SbaXFormAdapter::getGroupControl : not supported !"); - return sal_False; + return false; } void SAL_CALL SbaXFormAdapter::setGroupControl(sal_Bool /*GroupControl*/) throw( RuntimeException, std::exception ) diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 19d51528df6a..633e94ac61bf 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -1036,7 +1036,7 @@ IMPL_LINK_NOARG_TYPED(OGenericUnoController, OnAsyncCloseTask, void*, void) try { Reference< util::XCloseable > xCloseable( m_aCurrentFrame.getFrame(), UNO_QUERY_THROW ); - xCloseable->close( sal_False ); // false - holds the owner ship for this frame inside this object! + xCloseable->close( false ); // false - holds the owner ship for this frame inside this object! } catch( const Exception& ) { @@ -1068,7 +1068,7 @@ Reference< XFrame > SAL_CALL OGenericUnoController::getFrame() throw( RuntimeExc sal_Bool SAL_CALL OGenericUnoController::attachModel(const Reference< XModel > & /*xModel*/) throw( RuntimeException, std::exception ) { SAL_WARN("dbaccess.ui", "OGenericUnoController::attachModel: not supported!" ); - return sal_False; + return false; } void OGenericUnoController::executeUnChecked(sal_uInt16 _nCommandId, const Sequence< PropertyValue >& aArgs) diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 8edf4b21ffd2..6871c170eeef 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -324,7 +324,7 @@ void SbaXGridPeer::NotifyStatusChanged(const css::util::URL& _rUrl, const Refere if ( m_aDispatchStates.end() != aURLStatePos ) aEvt.State <<= aURLStatePos->second; else - aEvt.State <<= sal_False; + aEvt.State <<= false; if (xControl.is()) xControl->statusChanged(aEvt); @@ -452,7 +452,7 @@ void SAL_CALL SbaXGridPeer::dispatch(const URL& aURL, const Sequence< PropertyVa if ( dtUnknown != eURLType ) { // notify any status listeners that the dialog is now active (well, about to be active) - MapDispatchToBool::const_iterator aThisURLState = m_aDispatchStates.insert( MapDispatchToBool::value_type( eURLType, sal_True ) ).first; + MapDispatchToBool::const_iterator aThisURLState = m_aDispatchStates.insert( MapDispatchToBool::value_type( eURLType, true ) ).first; NotifyStatusChanged( aURL, nullptr ); // execute the dialog diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 297dd921eecd..361ffecbf4e1 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -581,9 +581,9 @@ void SbaTableQueryBrowser::initializePreviewMode() Reference< XPropertySet > xDataSourceSet(getRowSet(), UNO_QUERY); if ( xDataSourceSet.is() ) { - xDataSourceSet->setPropertyValue("AllowInserts",makeAny(sal_False)); - xDataSourceSet->setPropertyValue("AllowUpdates",makeAny(sal_False)); - xDataSourceSet->setPropertyValue("AllowDeletes",makeAny(sal_False)); + xDataSourceSet->setPropertyValue("AllowInserts",makeAny(false)); + xDataSourceSet->setPropertyValue("AllowUpdates",makeAny(false)); + xDataSourceSet->setPropertyValue("AllowDeletes",makeAny(false)); } } @@ -617,7 +617,7 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm if ( m_bPreview ) { *pStringIter++ = "AlwaysShowCursor"; - *pValueIter++ <<= sal_False; + *pValueIter++ <<= false; *pStringIter++ = PROPERTY_BORDER; *pValueIter++ <<= sal_Int16(0); } @@ -631,16 +631,16 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm if ( m_bPreview ) { *pStringIter++ = "HasNavigationBar"; - *pValueIter++ <<= sal_False; + *pValueIter++ <<= false; *pStringIter++ = "HasRecordMarker"; - *pValueIter++ <<= sal_False; + *pValueIter++ <<= false; } *pStringIter++ = PROPERTY_ROW_HEIGHT; *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_ROW_HEIGHT); if ( m_bPreview ) { *pStringIter++ = "Tabstop"; - *pValueIter++ <<= sal_False; + *pValueIter++ <<= false; } *pStringIter++ = PROPERTY_TEXTCOLOR; *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTCOLOR); @@ -963,7 +963,7 @@ sal_Bool SbaTableQueryBrowser::suspend(sal_Bool bSuspend) throw( RuntimeExceptio SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( getView() && getView()->IsInModalMode() ) - return sal_False; + return false; bool bRet = false; if ( !m_bInSuspend ) { @@ -1986,7 +1986,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue if ( aSelection.getLength() ) { aDescriptor[daSelection] <<= aSelection; - aDescriptor[daBookmarkSelection] <<= sal_False; + aDescriptor[daBookmarkSelection] <<= false; // these are selection indices // before we change this, all clients have to be adjusted // so that they recognize the new BookmarkSelection property! @@ -2381,7 +2381,7 @@ bool SbaTableQueryBrowser::implLoadAnything(const OUString& _rDataSourceName, co initFormatter(); // switch the grid to design mode while loading - getBrowserView()->getGridControl()->setDesignMode(sal_True); + getBrowserView()->getGridControl()->setDesignMode(true); InitializeForm( xProp ); bool bSuccess = true; @@ -3102,16 +3102,16 @@ void SbaTableQueryBrowser::impl_initialize() // disable the browser if either of ShowTreeViewButton (compatibility name) or EnableBrowser // is present and set to FALSE - bool bDisableBrowser = !rArguments.getOrDefault( "ShowTreeViewButton", sal_True ) // compatibility name - || !rArguments.getOrDefault( PROPERTY_ENABLE_BROWSER, sal_True ); + bool bDisableBrowser = !rArguments.getOrDefault( "ShowTreeViewButton", true ) // compatibility name + || !rArguments.getOrDefault( PROPERTY_ENABLE_BROWSER, true ); OSL_ENSURE( !rArguments.has( "ShowTreeViewButton" ), "SbaTableQueryBrowser::impl_initialize: ShowTreeViewButton is superseded by EnableBrowser!" ); m_bEnableBrowser = !bDisableBrowser; // hide the tree view it is disabled in general, or if the settings tell to hide it initially bool bHideTreeView = ( !m_bEnableBrowser ) - || !rArguments.getOrDefault( "ShowTreeView", sal_True ) // compatibility name - || !rArguments.getOrDefault( PROPERTY_SHOW_BROWSER, sal_True ); + || !rArguments.getOrDefault( "ShowTreeView", true ) // compatibility name + || !rArguments.getOrDefault( PROPERTY_SHOW_BROWSER, true ); OSL_ENSURE( !rArguments.has( "ShowTreeView" ), "SbaTableQueryBrowser::impl_initialize: ShowTreeView is superseded by ShowBrowser!" ); @@ -3130,17 +3130,17 @@ void SbaTableQueryBrowser::impl_initialize() OUString* pStringIter = aProperties.getArray(); Any* pValueIter = aValues.getArray(); *pStringIter++ = "AlwaysShowCursor"; - *pValueIter++ <<= sal_False; + *pValueIter++ <<= false; *pStringIter++ = PROPERTY_BORDER; *pValueIter++ <<= sal_Int16(0); *pStringIter++ = "HasNavigationBar"; - *pValueIter++ <<= sal_False; + *pValueIter++ <<= false; *pStringIter++ = "HasRecordMarker"; - *pValueIter++ <<= sal_False; + *pValueIter++ <<= false; *pStringIter++ = "Tabstop"; - *pValueIter++ <<= sal_False; + *pValueIter++ <<= false; Reference< XMultiPropertySet > xFormMultiSet(getFormComponent(), UNO_QUERY); if ( xFormMultiSet.is() ) @@ -3662,7 +3662,7 @@ bool SbaTableQueryBrowser::preReloadForm() if ( !m_pCurrentlyDisplayed ) { // switch the grid to design mode while loading - getBrowserView()->getGridControl()->setDesignMode(sal_True); + getBrowserView()->getGridControl()->setDesignMode(true); // we had an invalid statement so we need to connect the column models Reference<XPropertySet> xRowSetProps(getRowSet(),UNO_QUERY); svx::ODataAccessDescriptor aDesc(xRowSetProps); diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 1065ace7d514..20e1d9180969 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1670,7 +1670,7 @@ OUString OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldD Reference< css::util::XNumberFormatPreviewer> xPreviewer(xNumberFormatter,UNO_QUERY); OSL_ENSURE(xPreviewer.is(),"XNumberFormatPreviewer is null!"); - sDefault = xPreviewer->convertNumberToPreviewString(sFormat,nValue,aLocale,sal_True); + sDefault = xPreviewer->convertNumberToPreviewString(sFormat,nValue,aLocale,true); } else if ( !(_bCheck && sDefault.isEmpty()) ) sDefault = xNumberFormatter->formatString(nFormatKey, sDefault.isEmpty() ? sFormat : sDefault); diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index db4db5197c0a..f22a2fdbd800 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -186,7 +186,7 @@ IMPL_LINK_NOARG_TYPED(OSqlEdit, ModifyHdl, Edit&, void) OJoinController& rController = m_pView->getContainerWindow()->getDesignView()->getController(); if (!rController.isModified()) - rController.setModified( sal_True ); + rController.setModified( true ); rController.InvalidateFeature(SID_SBA_QRY_EXECUTE); rController.InvalidateFeature(SID_CUT); diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index ddf92545512b..2f8816e16aec 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -111,19 +111,19 @@ namespace dbaui if ( m_aCommandURL == ".uno:DBNewForm" ) { - m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewForm") ,sal_True)); - m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewView") ,sal_True)); - m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewViewSQL") ,sal_True)); - m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewQuery") ,sal_True)); - m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewQuerySql") ,sal_True)); - m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewReport") ,sal_True)); - m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewReportAutoPilot"),sal_True)); - m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewTable") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewForm") ,true)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewView") ,true)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewViewSQL") ,true)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewQuery") ,true)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewQuerySql") ,true)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewReport") ,true)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewReportAutoPilot"),true)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewTable") ,true)); } else { - m_aStates.insert(TCommandState::value_type(OUString(".uno:Refresh") ,sal_True)); - m_aStates.insert(TCommandState::value_type(OUString(".uno:DBRebuildData") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:Refresh") ,true)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBRebuildData") ,true)); } TCommandState::const_iterator aIter = m_aStates.begin(); diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index fe14de024b91..6c80b1cccbe6 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -266,13 +266,13 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal AuthenticationRequest aRequest; aRequest.ServerName = sName; aRequest.Diagnostic = sLoginRequest; - aRequest.HasRealm = aRequest.HasAccount = sal_False; + aRequest.HasRealm = aRequest.HasAccount = false; // aRequest.Realm aRequest.HasUserName = pUser != nullptr; aRequest.UserName = pUser ? OUString(pUser->GetValue()) : OUString(); - aRequest.HasPassword = sal_True; + aRequest.HasPassword = true; //aRequest.Password - aRequest.HasAccount = sal_False; + aRequest.HasAccount = false; // aRequest.Account comphelper::OInteractionRequest* pRequest = new comphelper::OInteractionRequest(makeAny(aRequest)); @@ -351,7 +351,7 @@ void ODbDataSourceAdministrationHelper::clearPassword() ::std::pair< Reference<XConnection>,sal_Bool> ODbDataSourceAdministrationHelper::createConnection() { ::std::pair< Reference<XConnection>,sal_Bool> aRet; - aRet.second = sal_False; + aRet.second = false; Sequence< PropertyValue > aConnectionParams; if ( getCurrentSettings(aConnectionParams) ) { @@ -362,7 +362,7 @@ void ODbDataSourceAdministrationHelper::clearPassword() { WaitObject aWaitCursor(m_pParent); aRet.first = getDriver()->connect(getConnectionURL(), aConnectionParams); - aRet.second = sal_True; + aRet.second = true; } catch (const SQLContext& e) { aErrorInfo = SQLExceptionInfo(e); } catch (const SQLWarning& e) { aErrorInfo = SQLExceptionInfo(e); } diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index a2bf8d096c21..f4224c789eb1 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -146,7 +146,7 @@ namespace dbaui m_xConnection = m_pImpl->createConnection().first; m_bOwnConnection = m_xConnection.is(); } - return ::std::pair< Reference<XConnection>,sal_Bool> (m_xConnection,sal_False); + return ::std::pair< Reference<XConnection>,sal_Bool> (m_xConnection,false); } Reference< XComponentContext > OUserAdminDlg::getORB() const { diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 7c1686c62450..e8051d859d75 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -295,7 +295,7 @@ namespace dbaui xProp->setPropertyValue(PROPERTY_TABLETYPEFILTER,aTableTypeFilter); if ( xModi.is() && !bModified ) - xModi->setModified(sal_False); + xModi->setModified(false); } diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 0278118472c9..09740afd0a51 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -196,7 +196,7 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection, aTypes.reserve(nCount+1); aNullable.reserve(nCount+1); aTypes.push_back(-1); - aNullable.push_back(sal_False); + aNullable.push_back(false); for (sal_Int32 j = 1; j <= nCount ; ++j) { aNullable.push_back(xResultSetMetaData->isNullable(j) != ColumnValue::NO_NULLS ); diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index c178dfb22a81..cf4cabdec2ab 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -454,7 +454,7 @@ void fillTypeInfo( const Reference< css::sdbc::XConnection>& _rxConnection, nCount = 18; aTypes.reserve(nCount+1); aTypes.push_back(-1); - aNullable.push_back(sal_False); + aNullable.push_back(false); for (sal_Int32 j = 1; j <= nCount ; ++j) { aTypes.push_back(xResultSetMetaData->getColumnType(j)); diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index f0045aba106f..6b91673a704a 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -119,11 +119,11 @@ namespace dbaui lArgs[nArg++] <<= aProp; aProp.Name = "TopWindow"; - aProp.Value <<= sal_True; + aProp.Value <<= true; lArgs[nArg++] <<= aProp; aProp.Name = "SupportPersistentWindowState"; - aProp.Value <<= sal_True; + aProp.Value <<= true; lArgs[nArg++] <<= aProp; m_xFrameLoader.set(xFact->createInstanceWithArguments(lArgs), UNO_QUERY_THROW); @@ -188,7 +188,7 @@ namespace dbaui DatabaseObjectView::fillDispatchArgs( i_rDispatchArgs, _aDataSource, _rObjectName ); const bool bIncludeQueryName = !_rObjectName.isEmpty(); - const bool bGraphicalDesign = i_rDispatchArgs.getOrDefault( PROPERTY_GRAPHICAL_DESIGN, sal_True ); + const bool bGraphicalDesign = i_rDispatchArgs.getOrDefault( PROPERTY_GRAPHICAL_DESIGN, true ); const bool bEditViewAsSQLCommand = ( m_nCommandType == CommandType::TABLE ) && !bGraphicalDesign; i_rDispatchArgs.put( OUString(PROPERTY_COMMAND_TYPE), m_nCommandType ); @@ -200,7 +200,7 @@ namespace dbaui if ( bEditViewAsSQLCommand ) { - i_rDispatchArgs.put( OUString(PROPERTY_ESCAPE_PROCESSING), sal_False ); + i_rDispatchArgs.put( OUString(PROPERTY_ESCAPE_PROCESSING), false ); } } @@ -285,7 +285,7 @@ namespace dbaui i_rDispatchArgs.put( OUString(PROPERTY_COMMAND_TYPE), (m_bTable ? CommandType::TABLE : CommandType::QUERY) ); i_rDispatchArgs.put( OUString(PROPERTY_COMMAND), _rQualifiedName ); - i_rDispatchArgs.put( OUString(PROPERTY_ENABLE_BROWSER), sal_False ); + i_rDispatchArgs.put( OUString(PROPERTY_ENABLE_BROWSER), false ); if ( m_bTable ) { diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index 1d00252ebc0e..26fce195d51d 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -403,15 +403,15 @@ namespace dbaui if ( !bSuspend && !isConnected() ) reconnect(true); - return sal_True; + return true; } sal_Bool SAL_CALL DBSubComponentController::attachModel( const Reference< XModel > & _rxModel) throw( RuntimeException, std::exception ) { if ( !_rxModel.is() ) - return sal_False; + return false; if ( !DBSubComponentController_Base::attachModel( _rxModel ) ) - return sal_False; + return false; m_pImpl->m_bNotAttached = false; if ( m_pImpl->m_nDocStartNumber == 1 ) @@ -422,7 +422,7 @@ namespace dbaui if ( xUntitledProvider.is() ) m_pImpl->m_nDocStartNumber = xUntitledProvider->leaseNumber( static_cast< XWeak* >( this ) ); - return sal_True; + return true; } void DBSubComponentController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& _rArgs) diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index 4487b9d2b369..4db5a73faedb 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -90,7 +90,7 @@ namespace dbaui GetUndoManager().AddUndoAction( _pAction ); // when we add an undo action the controller was modified - setModified( sal_True ); + setModified( true ); // now inform me that or states changed InvalidateFeature( ID_BROWSER_UNDO ); diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index c1dd52ed7715..31dfbee43ba5 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -254,7 +254,7 @@ void OJoinController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& return; case RET_NO: reset(); - setModified(sal_False); // and we are not modified yet + setModified(false); // and we are not modified yet break; default: break; @@ -322,12 +322,12 @@ void OJoinController::describeSupportedFeatures() sal_Bool SAL_CALL OJoinController::suspend(sal_Bool _bSuspend) throw( RuntimeException, std::exception ) { if ( getBroadcastHelper().bInDispose || getBroadcastHelper().bDisposed ) - return sal_True; + return true; SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( getView() && getView()->IsInModalMode() ) - return sal_False; + return false; bool bCheck = true; if ( _bSuspend ) { diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 8b2bd210178c..c57676d67b5b 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -386,7 +386,7 @@ void OJoinTableView::RemoveTabWin( OTableWindow* pTabWin ) if(aFind != rController.getTableWindowData().end()) { rController.getTableWindowData().erase(aFind); - rController.setModified(sal_True); + rController.setModified(true); } if ( !m_aTableMap.erase( pTabWin->GetWinName() ) ) @@ -1500,7 +1500,7 @@ void OJoinTableView::HideTabWins() for(;aIter != aEnd;++aIter) RemoveTabWin(aIter->second); - m_pView->getController().setModified(sal_True); + m_pView->getController().setModified(true); SetUpdateMode(true); @@ -1569,7 +1569,7 @@ Reference< XAccessible > OJoinTableView::CreateAccessible() void OJoinTableView::modified() { OJoinController& rController = m_pView->getController(); - rController.setModified( sal_True ); + rController.setModified( true ); rController.InvalidateFeature(ID_BROWSER_ADDTABLE); rController.InvalidateFeature(SID_RELATION_ADD_RELATION); } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 3c2123a58b56..c86de1d8dfc2 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2529,7 +2529,7 @@ IMPL_LINK_NOARG_TYPED( OQueryDesignView, SplitHdl, Splitter*, void ) m_bInSplitHandler = true; m_aSplitter->SetPosPixel( Point( m_aSplitter->GetPosPixel().X(),m_aSplitter->GetSplitPosPixel() ) ); static_cast<OQueryController&>(getController()).setSplitPos(m_aSplitter->GetSplitPosPixel()); - static_cast<OQueryController&>(getController()).setModified( sal_True ); + static_cast<OQueryController&>(getController()).setModified( true ); Resize(); m_bInSplitHandler = true; } @@ -2684,7 +2684,7 @@ void OQueryDesignView::cut() if( m_eChildFocus == SELECTION) { m_pSelectionBox->cut(); - static_cast<OQueryController&>(getController()).setModified(sal_True); + static_cast<OQueryController&>(getController()).setModified(true); } } @@ -2693,7 +2693,7 @@ void OQueryDesignView::paste() if( m_eChildFocus == SELECTION) { m_pSelectionBox->paste(); - static_cast<OQueryController&>(getController()).setModified(sal_True); + static_cast<OQueryController&>(getController()).setModified(true); } } diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index cbbbeeb9bed5..8a36b91642b4 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -123,7 +123,7 @@ namespace if( bOk ) { pData->SetJoinType(aDlg->GetJoinType()); - _pView->getDesignView()->getController().setModified(sal_True); + _pView->getDesignView()->getController().setModified(true); } return bOk; @@ -315,7 +315,7 @@ void OQueryTableView::ClearAll() OJoinTableView::ClearAll(); SetUpdateMode(true); - m_pView->getController().setModified(sal_True); + m_pView->getController().setModified(true); } VclPtr<OTableWindow> OQueryTableView::createWindow(const TTableWindowData::value_type& _pData) @@ -853,7 +853,7 @@ void OQueryTableView::HideTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAc pUndoAction->SetOwnership(true); // by doing so, we have modified the document - m_pView->getController().setModified( sal_True ); + m_pView->getController().setModified( true ); m_pView->getController().InvalidateFeature(SID_BROWSER_CLEAR_QUERY); } @@ -920,7 +920,7 @@ bool OQueryTableView::ShowTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAc // show that I have changed the document if(!m_pView->getController().isReadOnly()) - m_pView->getController().setModified( sal_True ); + m_pView->getController().setModified( true ); m_pView->getController().InvalidateFeature(SID_BROWSER_CLEAR_QUERY); diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index ff58450ff0ba..6090b28014a3 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -107,14 +107,14 @@ void OQueryTextView::cut() { if(!m_pEdit->IsInAccelAct() ) m_pEdit->Cut(); - getContainerWindow()->getDesignView()->getController().setModified(sal_True); + getContainerWindow()->getDesignView()->getController().setModified(true); } void OQueryTextView::paste() { if(!m_pEdit->IsInAccelAct() ) m_pEdit->Paste(); - getContainerWindow()->getDesignView()->getController().setModified(sal_True); + getContainerWindow()->getDesignView()->getController().setModified(true); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index ae0e953233de..ed085e4a5099 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1269,7 +1269,7 @@ void OSelectionBrowseBox::RemoveColumn(sal_uInt16 _nColumnId) ActivateCell( nCurrentRow, nCurCol ); - rController.setModified( sal_True ); + rController.setModified( true ); invalidateUndoRedo(); } @@ -1529,7 +1529,7 @@ void OSelectionBrowseBox::InsertColumn(const OTableFieldDescRef& pEntry, sal_uIn Invalidate( aInvalidRect ); ActivateCell( nCurrentRow, nCurCol ); - static_cast<OQueryController&>(getDesignView()->getController()).setModified( sal_True ); + static_cast<OQueryController&>(getDesignView()->getController()).setModified( true ); invalidateUndoRedo(); } @@ -1890,7 +1890,7 @@ void OSelectionBrowseBox::CellModified() } break; } - static_cast<OQueryController&>(getDesignView()->getController()).setModified( sal_True ); + static_cast<OQueryController&>(getDesignView()->getController()).setModified( true ); } void OSelectionBrowseBox::Fill() @@ -1990,12 +1990,12 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt) break; case ID_QUERY_DISTINCT: static_cast<OQueryController&>(getDesignView()->getController()).setDistinct(!static_cast<OQueryController&>(getDesignView()->getController()).isDistinct()); - static_cast<OQueryController&>(getDesignView()->getController()).setModified( sal_True ); + static_cast<OQueryController&>(getDesignView()->getController()).setModified( true ); static_cast<OQueryController&>(getDesignView()->getController()).InvalidateFeature( SID_QUERY_DISTINCT_VALUES ); break; } - static_cast<OQueryController&>(getDesignView()->getController()).setModified( sal_True ); + static_cast<OQueryController&>(getDesignView()->getController()).setModified( true ); } } else @@ -2314,7 +2314,7 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, sal_uInt16 nColId, con if (bWasEditing) ActivateCell(nCellIndex, nColId); - static_cast<OQueryController&>(getDesignView()->getController()).setModified( sal_True ); + static_cast<OQueryController&>(getDesignView()->getController()).setModified( true ); } void OSelectionBrowseBox::ColumnResized(sal_uInt16 nColId) @@ -2329,7 +2329,7 @@ void OSelectionBrowseBox::ColumnResized(sal_uInt16 nColId) OSL_ENSURE(nPos <= getFields().size(),"ColumnResized:: nColId sollte nicht groesser als List::count sein!"); OTableFieldDescRef pEntry = getEntry(nPos-1); OSL_ENSURE(pEntry.is(), "OSelectionBrowseBox::ColumnResized : keine FieldDescription !"); - static_cast<OQueryController&>(getDesignView()->getController()).setModified( sal_True ); + static_cast<OQueryController&>(getDesignView()->getController()).setModified( true ); EditBrowseBox::ColumnResized(nColId); if ( pEntry.is()) diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 903337bba807..d7dbc5eef76c 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -704,7 +704,7 @@ bool OTableWindow::PreNotify(NotifyEvent& rNEvt) pView->EnsureVisible(GetData()->GetPosition(), GetData()->GetSize()); pView->TabWinMoved(this,aOldDataPoint); Invalidate(InvalidateFlags::NoChildren); - getDesignView()->getController().setModified( sal_True ); + getDesignView()->getController().setModified( true ); } else { diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx index 8da722265150..da22b9c813cc 100644 --- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx @@ -146,7 +146,7 @@ void OTableWindowTitle::MouseButtonDown( const MouseEvent& rEvt ) conn->RecalcLines(); pView->InvalidateConnections(); - pView->getDesignView()->getController().setModified(sal_True); + pView->getDesignView()->getController().setModified(true); pView->Invalidate(InvalidateFlags::NoChildren); } } diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 1b8a39f75b62..686963571c27 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -72,7 +72,7 @@ namespace dbaui Reference< css::util::XCloseable > xCloseable(m_xBeamer,UNO_QUERY); m_xBeamer = nullptr; if(xCloseable.is()) - xCloseable->close(sal_False); // false - holds the ownership of this frame + xCloseable->close(false); // false - holds the ownership of this frame } m_pSplitter.disposeAndClear(); @@ -186,7 +186,7 @@ namespace dbaui if ( xLMPropSet.is() ) { const OUString aAutomaticToolbars( "AutomaticToolbars" ); - xLMPropSet->setPropertyValue( aAutomaticToolbars, Any( sal_False )); + xLMPropSet->setPropertyValue( aAutomaticToolbars, Any( false )); } } catch( Exception& ) diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 286ab7ee9aab..42a62c6093b5 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -568,7 +568,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& case ID_BROWSER_ESCAPEPROCESSING: setEscapeProcessing_fireEvent( !m_bEscapeProcessing ); if ( !editingView() ) - setModified(sal_True); + setModified(true); InvalidateFeature(ID_BROWSER_SQL); break; case ID_BROWSER_SAVEASDOC: @@ -697,17 +697,17 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& case SID_QUERY_VIEW_TABLES: case SID_QUERY_VIEW_ALIASES: getContainer()->setSlotEnabled(_nId,!getContainer()->isSlotEnabled(_nId)); - setModified(sal_True); + setModified(true); break; case SID_QUERY_DISTINCT_VALUES: m_bDistinct = !m_bDistinct; - setModified(sal_True); + setModified(true); break; case SID_QUERY_LIMIT: if ( aArgs.getLength() >= 1 && aArgs[0].Name == "DBLimit.Value" ) { aArgs[0].Value >>= m_nLimit; - setModified(sal_True); + setModified(true); } break; case SID_QUERY_PROP_DLG: @@ -727,7 +727,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& { try { - xCloseFrame->close( sal_True ); + xCloseFrame->close( true ); } catch(const Exception&) { @@ -1042,7 +1042,7 @@ void OQueryController::impl_initialize() Application::PostUserEvent( LINK( this, OQueryController, OnExecuteAddTable ) ); } - setModified(sal_False); + setModified(false); } catch(const SQLException& e) { @@ -1418,7 +1418,7 @@ bool OQueryController::doSaveAsDoc(bool _bSaveAs) OUString sTranslatedStmt = translateStatement(); if ( editingCommand() ) { - setModified( sal_False ); + setModified( false ); // this is all we need to do here. translateStatement implicitly set our m_sStatement, and // notified it, and that's all return true; @@ -1546,7 +1546,7 @@ bool OQueryController::doSaveAsDoc(bool _bSaveAs) releaseNumberForComponent(); } - setModified( sal_False ); + setModified( false ); bSuccess = true; } @@ -1929,7 +1929,7 @@ void OQueryController::setStatement_fireEvent( const OUString& _rNewStatement, b sal_Int32 nHandle = PROPERTY_ID_ACTIVECOMMAND; if ( _bFireStatementChange ) - fire( &nHandle, &aNewValue, &aOldValue, 1, sal_False ); + fire( &nHandle, &aNewValue, &aOldValue, 1, false ); } void OQueryController::setEscapeProcessing_fireEvent( const bool _bEscapeProcessing ) @@ -1942,7 +1942,7 @@ void OQueryController::setEscapeProcessing_fireEvent( const bool _bEscapeProcess Any aNewValue = makeAny( m_bEscapeProcessing ); sal_Int32 nHandle = PROPERTY_ID_ESCAPE_PROCESSING; - fire( &nHandle, &aNewValue, &aOldValue, 1, sal_False ); + fire( &nHandle, &aNewValue, &aOldValue, 1, false ); } IMPL_LINK_NOARG_TYPED( OQueryController, OnExecuteAddTable, void*, void ) diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index f884dccd4c7c..1478ee781d54 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -173,7 +173,7 @@ void ORelationController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue ::comphelper::NamedValueCollection aWindowsData; saveTableWindows( aWindowsData ); getDataSource()->setPropertyValue( PROPERTY_LAYOUTINFORMATION, makeAny( aWindowsData.getPropertyValues() ) ); - setModified(sal_False); + setModified(false); } } catch ( const Exception& ) @@ -474,7 +474,7 @@ IMPL_LINK_NOARG_TYPED( ORelationController, OnThreadFinished, void*, void ) getView()->initialize(); // show the windows and fill with our information getView()->Invalidate(InvalidateFlags::NoErase); ClearUndoManager(); - setModified(sal_False); // and we are not modified yet + setModified(false); // and we are not modified yet if(m_vTableData.empty()) Execute(ID_BROWSER_ADDTABLE,Sequence<PropertyValue>()); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index f784108e4719..55e8042767e8 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -688,7 +688,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId ) xController->SetModified(); // Set the Modify flag - GetView()->getController().setModified( sal_True ); + GetView()->getController().setModified( true ); InvalidateFeatures(); } @@ -815,7 +815,7 @@ void OTableEditorCtrl::InsertRows( long nRow ) // Create the Undo-Action GetUndoManager().AddUndoAction( new OTableEditorInsUndoAct(this, nRow,vInsertedUndoRedoRows) ); - GetView()->getController().setModified( sal_True ); + GetView()->getController().setModified( true ); InvalidateFeatures(); } @@ -852,7 +852,7 @@ void OTableEditorCtrl::DeleteRows() SetDataPtr( m_nDataPos ); ActivateCell(); pDescrWin->DisplayData( pActRow->GetActFieldDescr() ); - GetView()->getController().setModified( sal_True ); + GetView()->getController().setModified( true ); InvalidateFeatures(); } @@ -869,7 +869,7 @@ void OTableEditorCtrl::InsertNewRows( long nRow ) m_pRowList->insert( m_pRowList->begin()+i ,std::shared_ptr<OTableRow>(new OTableRow())); RowInserted( nRow, nInsertRows ); - GetView()->getController().setModified( sal_True ); + GetView()->getController().setModified( true ); InvalidateFeatures(); } @@ -1555,7 +1555,7 @@ void OTableEditorCtrl::SetPrimaryKey( bool bSet ) InvalidateHandleColumn(); // Set the TableDocSh's ModifyFlag - GetView()->getController().setModified( sal_True ); + GetView()->getController().setModified( true ); InvalidateFeatures(); } diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index d987f6a0ceb8..1f0f3d1a9797 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -519,7 +519,7 @@ void OTableController::impl_initialize() loadData(); // fill the column information from the table getView()->initialize(); // show the windows and fill with our information ClearUndoManager(); - setModified(sal_False); // and we are not modified yet + setModified(false); // and we are not modified yet } catch( const Exception& ) { @@ -537,12 +537,12 @@ bool OTableController::Construct(vcl::Window* pParent) sal_Bool SAL_CALL OTableController::suspend(sal_Bool /*_bSuspend*/) throw( RuntimeException, std::exception ) { if ( getBroadcastHelper().bInDispose || getBroadcastHelper().bDisposed ) - return sal_True; + return true; SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( getView() && getView()->IsInModalMode() ) - return sal_False; + return false; if ( getView() ) static_cast<OTableDesignView*>(getView())->GrabFocus(); bool bCheck = true; @@ -625,7 +625,7 @@ void SAL_CALL OTableController::disposing( const EventObject& _rSource ) throw(R stopTableListening(); m_xTable = nullptr; m_bNew = true; - setModified(sal_True); + setModified(true); } else OTableController_BASE::disposing( _rSource ); @@ -649,7 +649,7 @@ void OTableController::losingConnection( ) if(!m_xTable.is()) { m_bNew = true; - setModified(sal_True); + setModified(true); } InvalidateAll(); } @@ -1448,7 +1448,7 @@ void OTableController::reSyncRows() static_cast<OTableDesignView*>(getView())->reSync(); // show the windows and fill with our information ClearUndoManager(); - setModified(sal_False); // and we are not modified yet + setModified(false); // and we are not modified yet } OUString OTableController::createUniqueName(const OUString& _rName) @@ -1504,7 +1504,7 @@ void OTableController::reload() loadData(); // fill the column information from the table static_cast<OTableDesignView*>(getView())->reSync(); // show the windows and fill with our information ClearUndoManager(); - setModified(sal_False); // and we are not modified yet + setModified(false); // and we are not modified yet static_cast<OTableDesignView*>(getView())->Invalidate(); } diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx index f14ee645b472..51e394db73ca 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.cxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx @@ -49,7 +49,7 @@ void OTableDesignUndoAct::Undo() // doc has not been modified if first undo was reverted if( m_pTabDgnCtrl->m_nCurUndoActId == 0 ) { - m_pTabDgnCtrl->GetView()->getController().setModified(sal_False); + m_pTabDgnCtrl->GetView()->getController().setModified(false); m_pTabDgnCtrl->GetView()->getController().InvalidateFeature(SID_SAVEDOC); } } @@ -61,7 +61,7 @@ void OTableDesignUndoAct::Redo() // restore Modified-flag after Redo of first Undo-action if( m_pTabDgnCtrl->m_nCurUndoActId > 0 ) { - m_pTabDgnCtrl->GetView()->getController().setModified(sal_True); + m_pTabDgnCtrl->GetView()->getController().setModified(true); m_pTabDgnCtrl->GetView()->getController().InvalidateFeature(SID_SAVEDOC); } } @@ -92,7 +92,7 @@ void OTableDesignCellUndoAct::Undo() CellControllerRef xController = m_pTabDgnCtrl->Controller(); if ( xController.Is() ) xController->ClearModified(); - m_pTabDgnCtrl->GetView()->getController().setModified(sal_False); + m_pTabDgnCtrl->GetView()->getController().setModified(false); } diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index 8a19477eebed..580dc1ca6ec8 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -102,10 +102,10 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit } if (aComponentInfos.bVisible) - xW->setVisible(sal_True); + xW->setVisible(true); if (!aComponentInfos.bEnable) - xW->setEnable(sal_False); + xW->setEnable(false); if (maWindowListeners.getLength()) xW->addWindowListener( &maWindowListeners ); diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 144df8b397e2..b708ebc0fbae 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -373,7 +373,7 @@ CopyTableWizard::CopyTableWizard( const Reference< XComponentContext >& _rxORB ) ,m_xContext( _rxORB ) ,m_nOperation( CopyTableOperation::CopyDefinitionAndData ) ,m_sDestinationTable() - ,m_aPrimaryKeyName( sal_False, "ID" ) + ,m_aPrimaryKeyName( false, "ID" ) ,m_bUseHeaderLineAsColumnNames( true ) ,m_xSourceConnection() ,m_nCommandType( CommandType::COMMAND ) diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 554a12ae83ad..a2d01a7e3c67 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -114,7 +114,7 @@ sal_Bool SAL_CALL OSQLMessageDialog::convertFastPropertyValue( Any& _rConvertedV _rOldValue = m_aException; _rConvertedValue = aInfo.get(); - return sal_True; + return true; // always assume "modified", don't bother with comparing the two values } default: |