i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 31
+++-------
1 file changed, 11 insertions(+), 20 deletions(-)
New commits:
commit 3c1026bd793ebd81a94a9bf8514553aea23ce375
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jul 3 10:49:52 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jul 3 13:11:41 2020 +0200
only loop over props once
Change-Id: If41314c90397199c14c91fe65ed41243ac385dae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97827
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index ae1e77055e88..648e55be3b07 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -621,30 +621,21 @@ DefaultNumberingProvider::makeNumberingString( const
Sequence<beans::PropertyVal
OUString prefix;
sal_Int16 numType = -1; // type of formatting from
style::NumberingType (roman, arabic, etc)
OUString suffix;
- sal_Int32 number = -12345; // the number that needs to be
formatted.
+ sal_Int32 number = -1; // the number that needs to be formatted.
// int nProperties = aProperties.getLength();
// int last = nProperties-1;
- try {
- getPropertyByName(aProperties, "Prefix", false) >>=prefix;
- } catch (Exception&) {
- //prefix _must_ be empty here!
- }
- try {
- getPropertyByName(aProperties, "Suffix", false) >>=suffix;
- } catch (Exception&) {
- //suffix _must_ be empty here!
- }
- try {
- getPropertyByName(aProperties, "NumberingType", true) >>=numType;
- } catch (Exception& ) {
- numType = -1;
- }
- try {
- getPropertyByName(aProperties, "Value", true) >>=number;
- } catch (Exception& ) {
- number = -1;
+ for (auto const & prop : aProperties)
+ {
+ if (prop.Name == "Prefix")
+ prop.Value >>= prefix;
+ else if (prop.Name == "Suffix")
+ prop.Value >>= suffix;
+ else if (prop.Name == "NumberingType")
+ prop.Value >>= numType;
+ else if (prop.Name == "Value")
+ prop.Value >>= number;
}
if( number <= 0 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
