diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-28 12:29:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-28 13:25:27 +0200 |
| commit | 1705fbe9daac56ee9bea8d8fd7c7f57e2bec49b5 (patch) | |
| tree | aaf39244173a4cf20df6568140ebdbe5ec055656 /linguistic | |
| parent | dfa8e18e8e6c7ad87e423393f8293a20188de1fd (diff) | |
move the castToFastAttributeList function
to the slightly higher namespace, to make it easy and more readable to
use directly in a for-loop-range expression.
And make it return a reference rather than a pointer, since it is never
allowed to be nullptr.
Change-Id: I15d0b32493ef65cfc601b247c272b318f1eadfd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93049
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'linguistic')
| -rw-r--r-- | linguistic/source/convdicxml.cxx | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 99e9959957ff..a581e86ce36a 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -181,24 +181,18 @@ css::uno::Reference<XFastContextHandler> ConvDicXMLImportContext::createFastChil void ConvDicXMLDictionaryContext_Impl::startFastElement( sal_Int32 /*nElement*/, const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttrList ) { - if ( rxAttrList.is() ) + for (auto &aIter : sax_fastparser::castToFastAttributeList( rxAttrList )) { - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( rxAttrList ); - - for (auto &aIter : *pAttribList) + switch (aIter.getToken()) { - switch (aIter.getToken()) - { - case XML_NAMESPACE_TCD | XML_LANG: - nLanguage = LanguageTag::convertToLanguageType( aIter.toString() ); - break; - case XML_NAMESPACE_TCD | XML_CONVERSION_TYPE: - nConversionType = GetConversionTypeFromText( aIter.toString() ); - break; - default: - ; - } + case XML_NAMESPACE_TCD | XML_LANG: + nLanguage = LanguageTag::convertToLanguageType( aIter.toString() ); + break; + case XML_NAMESPACE_TCD | XML_CONVERSION_TYPE: + nConversionType = GetConversionTypeFromText( aIter.toString() ); + break; + default: + ; } } GetConvDicImport().SetLanguage( nLanguage ); @@ -228,13 +222,7 @@ void ConvDicXMLEntryTextContext_Impl::startFastElement( sal_Int32 /*Element*/, const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttrList ) { - if ( !rxAttrList.is() ) - return; - - sax_fastparser::FastAttributeList *pAttribList = - sax_fastparser::FastAttributeList::castToFastAttributeList( rxAttrList ); - - for (auto &aIter : *pAttribList) + for (auto &aIter : sax_fastparser::castToFastAttributeList( rxAttrList )) { switch (aIter.getToken()) { |