diff options
Diffstat (limited to 'xmlhelp/source/treeview/tvread.cxx')
| -rw-r--r-- | xmlhelp/source/treeview/tvread.cxx | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 32be860859c0..f11ae69d948e 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -897,19 +897,16 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP { Sequence< Reference< deployment::XPackage > > aPkgSeq = xPackage->getBundle ( Reference<task::XAbortChannel>(), Reference<ucb::XCommandEnvironment>() ); - sal_Int32 nPkgCount = aPkgSeq.getLength(); - const Reference< deployment::XPackage >* pSeq = aPkgSeq.getConstArray(); - for( sal_Int32 iPkg = 0 ; iPkg < nPkgCount ; ++iPkg ) + auto pSubPkg = std::find_if(aPkgSeq.begin(), aPkgSeq.end(), + [](const Reference< deployment::XPackage >& xSubPkg) { + const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xSubPkg->getPackageType(); + OUString aMediaType = xPackageTypeInfo->getMediaType(); + return aMediaType == aHelpMediaType; + }); + if (pSubPkg != aPkgSeq.end()) { - const Reference< deployment::XPackage > xSubPkg = pSeq[ iPkg ]; - const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xSubPkg->getPackageType(); - OUString aMediaType = xPackageTypeInfo->getMediaType(); - if( aMediaType == aHelpMediaType ) - { - xHelpPackage = xSubPkg; - o_xParentPackageBundle = xPackage; - break; - } + xHelpPackage = *pSubPkg; + o_xParentPackageBundle = xPackage; } } else @@ -1025,11 +1022,8 @@ void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< OUS OUString aExtensionPath = xPackage->getURL(); Sequence< OUString > aEntrySeq = m_xSFA->getFolderContents( aExtensionPath, true ); - const OUString* pSeq = aEntrySeq.getConstArray(); - sal_Int32 nCount = aEntrySeq.getLength(); - for( sal_Int32 i = 0 ; i < nCount ; ++i ) + for( const OUString& aEntry : aEntrySeq ) { - OUString aEntry = pSeq[i]; if( m_xSFA->isFolder( aEntry ) ) { sal_Int32 nLastSlash = aEntry.lastIndexOf( '/' ); |