diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2024-04-29 01:31:19 +0500 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2024-04-29 23:15:33 +0200 |
| commit | 8755c80018bec656e1b102da25edc450da4eee52 (patch) | |
| tree | 2bb7559605c11e18f7e9063f15e4772b438d4582 /canvas/source/factory | |
| parent | 20070d12c85ae6db8d5b1374a49f92b34137c8b1 (diff) | |
Drop uses of css::uno::Sequence::getConstArray in canvas .. connectivity
where it was obsoleted by commits 2484de6728bd11bb7949003d112f1ece2223c7a1
(Remove non-const Sequence::begin()/end() in internal code, 2021-10-15) and
fb3c04bd1930eedacd406874e1a285d62bbf27d9 (Drop non-const Sequence::operator[]
in internal code 2021-11-05).
Change-Id: I9467028fd1a7eeafad7f0dd776a91a9a40770b48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166816
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'canvas/source/factory')
| -rw-r--r-- | canvas/source/factory/cf_service.cxx | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 94f7069e267a..10d05379e8e9 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -142,13 +142,10 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) : Reference<container::XHierarchicalNameAccess> xHierarchicalNameAccess( xNameAccess, UNO_QUERY_THROW); - Sequence<OUString> serviceNames = xNameAccess->getElementNames(); - const OUString* pCurr = serviceNames.getConstArray(); - const OUString* const pEnd = pCurr + serviceNames.getLength(); - while( pCurr != pEnd ) + for (auto& serviceName : xNameAccess->getElementNames()) { Reference<container::XNameAccess> xEntryNameAccess( - xHierarchicalNameAccess->getByHierarchicalName(*pCurr), + xHierarchicalNameAccess->getByHierarchicalName(serviceName), UNO_QUERY ); if( xEntryNameAccess.is() ) @@ -156,20 +153,17 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) : Sequence<OUString> implementationList; if( xEntryNameAccess->getByName("PreferredImplementations") >>= implementationList ) { - m_aAvailableImplementations.emplace_back(*pCurr,implementationList ); + m_aAvailableImplementations.emplace_back(serviceName, implementationList); } if( xEntryNameAccess->getByName("AcceleratedImplementations") >>= implementationList ) { - m_aAcceleratedImplementations.emplace_back(*pCurr,implementationList ); + m_aAcceleratedImplementations.emplace_back(serviceName, implementationList); } if( xEntryNameAccess->getByName("AntialiasingImplementations") >>= implementationList ) { - m_aAAImplementations.emplace_back(*pCurr,implementationList ); + m_aAAImplementations.emplace_back(serviceName, implementationList); } - } - - ++pCurr; } } catch (const RuntimeException &) |