From 05f742d28b3786f44781af5b069c05c16b84decd Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sun, 16 Feb 2014 22:51:15 +0100 Subject: comphelper: sal_Bool -> bool Change-Id: I6fc331ae0706f4bb193543011c8d4ae0a385fcc0 --- dbaccess/source/core/api/RowSet.cxx | 2 +- dbaccess/source/core/dataaccess/connection.cxx | 2 +- .../source/ext/macromigration/migrationengine.cxx | 4 ++-- dbaccess/source/ui/browser/brwctrlr.cxx | 20 ++++++++++---------- dbaccess/source/ui/misc/UITools.cxx | 2 +- dbaccess/source/ui/querydesign/QueryTableView.cxx | 4 ++-- dbaccess/source/ui/querydesign/querycontroller.cxx | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'dbaccess/source') diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 5e5af3f2bd25..a167d72fefe5 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -1888,7 +1888,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_RELATIVEPOSITION,makeAny(sal_Int32(i+1))); pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_WIDTH,makeAny(sal_Int32(227))); pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_ALIGN,makeAny((sal_Int32)0)); - pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_HIDDEN,::cppu::bool2any(sal_False)); + pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_HIDDEN,::cppu::bool2any(false)); } catch(Exception&) { diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 7f0bccc20e79..4e93cd7842b2 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -92,7 +92,7 @@ Sequence< OUString > OConnection::getSupportedServiceNames( ) throw (RuntimeExc SAL_INFO("dbaccess", "OConnection::getSupportedServiceNames" ); Sequence< OUString > aSupported = OConnectionWrapper::getSupportedServiceNames(); - if ( 0 == findValue( aSupported, SERVICE_SDB_CONNECTION, sal_True ).getLength() ) + if ( 0 == findValue( aSupported, SERVICE_SDB_CONNECTION, true ).getLength() ) { sal_Int32 nLen = aSupported.getLength(); aSupported.realloc( nLen + 1 ); diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index aa3fc5f505e6..b7cc3feb3ce0 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -1176,7 +1176,7 @@ namespace dbmm const sal_Int32 nBaseNameLen = sBaseName.getLength(); for ( sal_Int32 i=0; i the current field isn't modified anymore, too setCurrentModified( sal_False ); @@ -1115,7 +1115,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t // switching to a new record ? if ( (evt.PropertyName.equals(PROPERTY_ISNEW)) - && (::comphelper::getBOOL(evt.NewValue) == sal_True) + && ::comphelper::getBOOL(evt.NewValue) ) { if (::comphelper::getINT32(xSource->getPropertyValue(PROPERTY_ROWCOUNT)) == 0) @@ -1719,7 +1719,7 @@ void SbaXDataBrowserController::applyParserFilter(const OUString& _rOldFilter, s FormErrorHelper aError(this); xFormSet->setPropertyValue(PROPERTY_FILTER, makeAny(_xParser->getFilter())); xFormSet->setPropertyValue(PROPERTY_HAVING_CLAUSE, makeAny(_xParser->getHavingClause())); - xFormSet->setPropertyValue(PROPERTY_APPLYFILTER, ::comphelper::makeBoolAny(sal_Bool(sal_True))); + xFormSet->setPropertyValue(PROPERTY_APPLYFILTER, ::comphelper::makeBoolAny(true)); bSuccess = reloadForm(m_xLoadable); } @@ -1884,8 +1884,8 @@ void SbaXDataBrowserController::ExecuteSearch() // prohibit the synchronization of the grid's display with the cursor's position Reference< XPropertySet > xModelSet(getControlModel(), UNO_QUERY); OSL_ENSURE(xModelSet.is(), "SbaXDataBrowserController::ExecuteSearch : no model set ?!"); - xModelSet->setPropertyValue("DisplayIsSynchron", ::comphelper::makeBoolAny(sal_Bool(sal_False))); - xModelSet->setPropertyValue("AlwaysShowCursor", ::comphelper::makeBoolAny(sal_Bool(sal_True))); + xModelSet->setPropertyValue("DisplayIsSynchron", ::comphelper::makeBoolAny(false)); + xModelSet->setPropertyValue("AlwaysShowCursor", ::comphelper::makeBoolAny(true)); xModelSet->setPropertyValue("CursorColor", makeAny(sal_Int32(COL_LIGHTRED))); Reference< ::com::sun::star::util::XNumberFormatsSupplier > xNFS(::dbtools::getNumberFormats(::dbtools::getConnection(m_xRowSet), sal_True, getORB())); @@ -1909,8 +1909,8 @@ void SbaXDataBrowserController::ExecuteSearch() } // restore the grid's normal operating state - xModelSet->setPropertyValue("DisplayIsSynchron", ::comphelper::makeBoolAny(sal_Bool(sal_True))); - xModelSet->setPropertyValue("AlwaysShowCursor", ::comphelper::makeBoolAny(sal_Bool(sal_False))); + xModelSet->setPropertyValue("DisplayIsSynchron", ::comphelper::makeBoolAny(true)); + xModelSet->setPropertyValue("AlwaysShowCursor", ::comphelper::makeBoolAny(false)); xModelSet->setPropertyValue("CursorColor", Any()); } @@ -1963,7 +1963,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property { Reference< XPropertySet > xActiveSet(getRowSet(), UNO_QUERY); sal_Bool bApplied = ::comphelper::getBOOL(xActiveSet->getPropertyValue(PROPERTY_APPLYFILTER)); - xActiveSet->setPropertyValue(PROPERTY_APPLYFILTER, ::comphelper::makeBoolAny(sal_Bool(!bApplied))); + xActiveSet->setPropertyValue(PROPERTY_APPLYFILTER, ::comphelper::makeBoolAny(!bApplied)); reloadForm(m_xLoadable); } InvalidateFeature(ID_BROWSER_FILTERED); @@ -2439,7 +2439,7 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn Reference< XPropertySet > xModelSet(getControlModel(), UNO_QUERY); OSL_ENSURE(xModelSet.is(), "SbaXDataBrowserController::OnFoundData : no model set ?!"); Any aOld = xModelSet->getPropertyValue("DisplayIsSynchron"); - xModelSet->setPropertyValue("DisplayIsSynchron", ::comphelper::makeBoolAny(sal_Bool(sal_True))); + xModelSet->setPropertyValue("DisplayIsSynchron", ::comphelper::makeBoolAny(true)); xModelSet->setPropertyValue("DisplayIsSynchron", aOld); // and move to the field @@ -2485,7 +2485,7 @@ IMPL_LINK(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInformatio Reference< XPropertySet > xModelSet(getControlModel(), UNO_QUERY); OSL_ENSURE(xModelSet.is(), "SbaXDataBrowserController::OnCanceledNotFound : no model set ?!"); Any aOld = xModelSet->getPropertyValue("DisplayIsSynchron"); - xModelSet->setPropertyValue("DisplayIsSynchron", ::comphelper::makeBoolAny(sal_Bool(sal_True))); + xModelSet->setPropertyValue("DisplayIsSynchron", ::comphelper::makeBoolAny(true)); xModelSet->setPropertyValue("DisplayIsSynchron", aOld); } catch( const Exception& ) diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 0545cd68f1a0..a0e3c457370c 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -406,7 +406,7 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, } else { - ::comphelper::UStringMixEqual aCase(sal_False); + ::comphelper::UStringMixEqual aCase(false); // search for typeinfo where the typename is equal _sTypeName OTypeInfoMap::const_iterator typeInfoLoop = _rTypeInfo.begin(); OTypeInfoMap::const_iterator typeInfoEnd = _rTypeInfo.end(); diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 8397a6a78ccd..f50aadb57207 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -189,7 +189,7 @@ namespace pNewConnData->SetFieldType(JTCS_TO,isColumnInKeyType(xReferencedKeys,sRelatedColumn,KeyType::PRIMARY) ? TAB_PRIMARY_FIELD : TAB_NORMAL_FIELD); { - Sequence< sal_Int16> aFind(::comphelper::findValue(_rSource.GetOriginalColumns()->getElementNames(),*pIter,sal_True)); + Sequence< sal_Int16> aFind(::comphelper::findValue(_rSource.GetOriginalColumns()->getElementNames(),*pIter,true)); if(aFind.getLength()) pNewConnData->SetFieldIndex(JTCS_FROM,aFind[0]+1); else @@ -199,7 +199,7 @@ namespace Reference xRefColumns = _rDest.GetOriginalColumns(); if(xRefColumns.is()) { - Sequence< sal_Int16> aFind(::comphelper::findValue(xRefColumns->getElementNames(),sRelatedColumn,sal_True)); + Sequence< sal_Int16> aFind(::comphelper::findValue(xRefColumns->getElementNames(),sRelatedColumn,true)); if(aFind.getLength()) pNewConnData->SetFieldIndex(JTCS_TO,aFind[0]+1); else diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index f445c2a6b575..94de2c99109e 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1333,7 +1333,7 @@ void OQueryController::executeQuery() aProps[2].Value <<= sTranslatedStmt; aProps[3].Name = PROPERTY_ENABLE_BROWSER; - aProps[3].Value = ::cppu::bool2any(sal_False); + aProps[3].Value = ::cppu::bool2any(false); aProps[4].Name = PROPERTY_ACTIVE_CONNECTION; aProps[4].Value <<= getConnection(); -- cgit