diff options
Diffstat (limited to 'dbaccess/source/ui/browser')
| -rw-r--r-- | dbaccess/source/ui/browser/exsrcbrw.cxx | 32 | ||||
| -rw-r--r-- | dbaccess/source/ui/browser/formadapter.cxx | 24 | ||||
| -rw-r--r-- | dbaccess/source/ui/browser/sbagrid.cxx | 15 | ||||
| -rw-r--r-- | dbaccess/source/ui/browser/unodatbr.cxx | 40 |
4 files changed, 45 insertions, 66 deletions
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 6c5b5d5dcc59..a3aca9051c72 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -132,39 +132,38 @@ void SbaExternalSourceBrowser::modified(const css::lang::EventObject& aEvent) void SAL_CALL SbaExternalSourceBrowser::dispatch(const css::util::URL& aURL, const Sequence< css::beans::PropertyValue>& aArgs) { - const css::beans::PropertyValue* pArguments = aArgs.getConstArray(); if ( aURL.Complete == ".uno:FormSlots/AddGridColumn" ) { // search the argument describing the column to create OUString sControlType; sal_Int32 nControlPos = -1; Sequence< css::beans::PropertyValue> aControlProps; - for ( sal_Int32 i = 0; i < aArgs.getLength(); ++i, ++pArguments ) + for ( const css::beans::PropertyValue& rArgument : aArgs ) { - if ( pArguments->Name == "ColumnType" ) + if ( rArgument.Name == "ColumnType" ) { - auto s = o3tl::tryAccess<OUString>(pArguments->Value); + auto s = o3tl::tryAccess<OUString>(rArgument.Value); OSL_ENSURE(s, "invalid type for argument \"ColumnType\" !"); if (s) sControlType = *s; } - else if ( pArguments->Name == "ColumnPosition" ) + else if ( rArgument.Name == "ColumnPosition" ) { - auto n = o3tl::tryAccess<sal_Int16>(pArguments->Value); + auto n = o3tl::tryAccess<sal_Int16>(rArgument.Value); OSL_ENSURE(n, "invalid type for argument \"ColumnPosition\" !"); if (n) nControlPos = *n; } - else if ( pArguments->Name == "ColumnProperties" ) + else if ( rArgument.Name == "ColumnProperties" ) { auto s = o3tl::tryAccess<Sequence<css::beans::PropertyValue>>( - pArguments->Value); + rArgument.Value); OSL_ENSURE(s, "invalid type for argument \"ColumnProperties\" !"); if (s) aControlProps = *s; } else - SAL_WARN("dbaccess.ui", "SbaExternalSourceBrowser::dispatch(AddGridColumn) : unknown argument (" << pArguments->Name << ") !"); + SAL_WARN("dbaccess.ui", "SbaExternalSourceBrowser::dispatch(AddGridColumn) : unknown argument (" << rArgument.Name << ") !"); } if (sControlType.isEmpty()) { @@ -182,17 +181,16 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const css::util::URL& aURL, con // set its properties if (xNewColProperties.is()) { - const css::beans::PropertyValue* pControlProps = aControlProps.getConstArray(); - for (sal_Int32 i=0; i<aControlProps.getLength(); ++i, ++pControlProps) + for (const css::beans::PropertyValue& rControlProp : aControlProps) { try { - if (xNewColProperties->hasPropertyByName(pControlProps->Name)) - xNewCol->setPropertyValue(pControlProps->Name, pControlProps->Value); + if (xNewColProperties->hasPropertyByName(rControlProp.Name)) + xNewCol->setPropertyValue(rControlProp.Name, rControlProp.Value); } catch (const Exception&) { - SAL_WARN("dbaccess.ui", "SbaExternalSourceBrowser::dispatch : could not set a column property (" << pControlProps->Name << ")!"); + SAL_WARN("dbaccess.ui", "SbaExternalSourceBrowser::dispatch : could not set a column property (" << rControlProp.Name << ")!"); } } } @@ -219,11 +217,11 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const css::util::URL& aURL, con Reference< XRowSet > xMasterForm; // search the arguments for the master form - for (sal_Int32 i=0; i<aArgs.getLength(); ++i, ++pArguments) + for (const css::beans::PropertyValue& rArgument : aArgs) { - if ( (pArguments->Name == "MasterForm") && (pArguments->Value.getValueTypeClass() == TypeClass_INTERFACE) ) + if ( (rArgument.Name == "MasterForm") && (rArgument.Value.getValueTypeClass() == TypeClass_INTERFACE) ) { - xMasterForm.set(pArguments->Value, UNO_QUERY); + xMasterForm.set(rArgument.Value, UNO_QUERY); break; } } diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index 7fd72dbd7464..1fd7948ceafc 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -1206,14 +1206,11 @@ Reference< css::beans::XPropertySetInfo > SAL_CALL SbaXFormAdapter::getPropertyS if (-1 == m_nNamePropHandle) { // we need to determine the handle for the NAME property - Sequence< css::beans::Property> aProps = xReturn->getProperties(); - const css::beans::Property* pProps = aProps.getConstArray(); - - for (sal_Int32 i=0; i<aProps.getLength(); ++i, ++pProps) + for (const css::beans::Property& rProp : xReturn->getProperties()) { - if (pProps->Name == PROPERTY_NAME) + if (rProp.Name == PROPERTY_NAME) { - m_nNamePropHandle = pProps->Handle; + m_nNamePropHandle = rProp.Handle; break; } } @@ -1234,16 +1231,14 @@ Sequence< Any > SAL_CALL SbaXFormAdapter::getPropertyValues(const Sequence< OUSt if (!xSet.is()) return Sequence< Any>(aPropertyNames.getLength()); - Sequence< Any> aReturn = xSet->getPropertyValues(aPropertyNames); + Sequence< Any> aReturn = xSet->getPropertyValues(aPropertyNames); // search for (and fake) the NAME property - const OUString* pNames = aPropertyNames.getConstArray(); - Any* pValues = aReturn.getArray(); OSL_ENSURE(aReturn.getLength() == aPropertyNames.getLength(), "SAL_CALL SbaXFormAdapter::getPropertyValues : the main form returned an invalid-length sequence !"); - for (sal_Int32 i=0; i<aPropertyNames.getLength(); ++i, ++pNames, ++pValues) - if (*pNames == PROPERTY_NAME) + for (sal_Int32 i=0; i<aPropertyNames.getLength(); ++i) + if (aPropertyNames[i] == PROPERTY_NAME) { - (*pValues) <<= m_sName; + aReturn[i] <<= m_sName; break; } @@ -1336,9 +1331,8 @@ Sequence< css::beans::PropertyState> SAL_CALL SbaXFormAdapter::getPropertyStates // set them all to DEFAULT Sequence< css::beans::PropertyState> aReturn(aPropertyName.getLength()); - css::beans::PropertyState* pStates = aReturn.getArray(); - for (sal_Int32 i=0; i<aPropertyName.getLength(); ++i, ++pStates) - *pStates = css::beans::PropertyState_DEFAULT_VALUE; + for (css::beans::PropertyState& rState : aReturn) + rState = css::beans::PropertyState_DEFAULT_VALUE; return aReturn; } diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 2d5d39cab684..3d0e8a75aa46 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -427,22 +427,21 @@ void SAL_CALL SbaXGridPeer::dispatch(const URL& aURL, const Sequence< PropertyVa SolarMutexGuard aGuard; sal_Int16 nColId = -1; - const PropertyValue* pArgs = aArgs.getConstArray(); - for (sal_Int32 i=0; i<aArgs.getLength(); ++i, ++pArgs) + for (const PropertyValue& rArg : aArgs) { - if (pArgs->Name == "ColumnViewPos") + if (rArg.Name == "ColumnViewPos") { - nColId = pGrid->GetColumnIdFromViewPos(::comphelper::getINT16(pArgs->Value)); + nColId = pGrid->GetColumnIdFromViewPos(::comphelper::getINT16(rArg.Value)); break; } - if (pArgs->Name == "ColumnModelPos") + if (rArg.Name == "ColumnModelPos") { - nColId = pGrid->GetColumnIdFromModelPos(::comphelper::getINT16(pArgs->Value)); + nColId = pGrid->GetColumnIdFromModelPos(::comphelper::getINT16(rArg.Value)); break; } - if (pArgs->Name == "ColumnId") + if (rArg.Name == "ColumnId") { - nColId = ::comphelper::getINT16(pArgs->Value); + nColId = ::comphelper::getINT16(rArg.Value); break; } } diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 3f70fdb4e1b0..689c4d2fc480 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -657,16 +657,13 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm OUString aCurrentModelType; Reference<XColumnsSupplier> xSupCols(getRowSet(),UNO_QUERY); Reference<XNameAccess> xColumns = xSupCols->getColumns(); - Sequence< OUString> aNames = xColumns->getElementNames(); - const OUString* pIter = aNames.getConstArray(); - const OUString* pEnd = pIter + aNames.getLength(); OUString sDefaultProperty; Reference< XPropertySet > xColumn; Reference< XPropertySetInfo > xColPSI; - for (sal_uInt16 i=0; pIter != pEnd; ++i,++pIter) + for (const OUString& rName : xColumns->getElementNames()) { - xColumn.set( xColumns->getByName( *pIter ), UNO_QUERY_THROW ); + xColumn.set( xColumns->getByName( rName ), UNO_QUERY_THROW ); xColPSI.set( xColumn->getPropertySetInfo(), UNO_SET_THROW ); // ignore the column when it is a rowversion one @@ -730,13 +727,13 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm break; } - aInitialValues.emplace_back( PROPERTY_CONTROLSOURCE, makeAny( *pIter ) ); + aInitialValues.emplace_back( PROPERTY_CONTROLSOURCE, makeAny( rName ) ); OUString sLabel; xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel; if ( !sLabel.isEmpty() ) aInitialValues.emplace_back( PROPERTY_LABEL, makeAny( sLabel ) ); else - aInitialValues.emplace_back( PROPERTY_LABEL, makeAny( *pIter ) ); + aInitialValues.emplace_back( PROPERTY_LABEL, makeAny( rName ) ); Reference< XPropertySet > xGridCol( xColFactory->createColumn( aCurrentModelType ), UNO_SET_THROW ); Reference< XPropertySetInfo > xGridColPSI( xGridCol->getPropertySetInfo(), UNO_SET_THROW ); @@ -799,7 +796,7 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm ) xGridCol->setPropertyValue( *copyPropertyName, xColumn->getPropertyValue( *copyPropertyName ) ); - xColContainer->insertByName(*pIter, makeAny(xGridCol)); + xColContainer->insertByName(rName, makeAny(xGridCol)); } } } @@ -2083,11 +2080,8 @@ void SbaTableQueryBrowser::initializeTreeModel() OUString sQueriesName, sTablesName; // fill the model with the names of the registered datasources - Sequence< OUString > aDatasources = m_xDatabaseContext->getElementNames(); - const OUString* pIter = aDatasources.getConstArray(); - const OUString* pEnd = pIter + aDatasources.getLength(); - for (; pIter != pEnd; ++pIter) - implAddDatasource( *pIter, aDBImage, sQueriesName, aQueriesImage, sTablesName, aTablesImage, SharedConnection() ); + for (const OUString& rDatasource : m_xDatabaseContext->getElementNames()) + implAddDatasource( rDatasource, aDBImage, sQueriesName, aQueriesImage, sTablesName, aTablesImage, SharedConnection() ); } } @@ -2101,22 +2095,19 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce try { - Sequence< OUString > aNames = _xNameAccess->getElementNames(); - const OUString* pIter = aNames.getConstArray(); - const OUString* pEnd = pIter + aNames.getLength(); - for (; pIter != pEnd; ++pIter) + for (const OUString& rName : _xNameAccess->getElementNames()) { - if( !m_pTreeView->getListBox().GetEntryPosByName(*pIter,_pParent)) + if( !m_pTreeView->getListBox().GetEntryPosByName(rName,_pParent)) { DBTreeListUserData* pEntryData = new DBTreeListUserData; pEntryData->eType = _eEntryType; if ( _eEntryType == etQuery ) { - Reference<XNameAccess> xChild(_xNameAccess->getByName(*pIter),UNO_QUERY); + Reference<XNameAccess> xChild(_xNameAccess->getByName(rName),UNO_QUERY); if ( xChild.is() ) pEntryData->eType = etQueryContainer; } - implAppendEntry( _pParent, *pIter, pEntryData, pEntryData->eType ); + implAppendEntry( _pParent, rName, pEntryData, pEntryData->eType ); } } } @@ -3591,14 +3582,11 @@ void SbaTableQueryBrowser::frameAction(const css::frame::FrameActionEvent& aEven void SbaTableQueryBrowser::clearGridColumns(const Reference< XNameContainer >& _xColContainer) { // first we have to clear the grid - Sequence< OUString > aNames = _xColContainer->getElementNames(); - const OUString* pIter = aNames.getConstArray(); - const OUString* pEnd = pIter + aNames.getLength(); Reference< XInterface > xColumn; - for (; pIter != pEnd;++pIter) + for (const OUString& rName : _xColContainer->getElementNames()) { - _xColContainer->getByName(*pIter) >>= xColumn; - _xColContainer->removeByName(*pIter); + _xColContainer->getByName(rName) >>= xColumn; + _xColContainer->removeByName(rName); ::comphelper::disposeComponent(xColumn); } } |