[Libreoffice-commits] core.git: xmloff/source

[Mike Kaganski (via logerrit)]

 xmloff/source/text/txtparae.cxx |   28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

New commits:
commit 8c067a96210992bef666a96d980c2c77ae223626
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Tue Aug 4 22:48:45 2020 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed Aug 5 08:21:16 2020 +0200

    Simplify this a little
    
    Change-Id: I81298ad97ef2161fb9e52466b7e17cd5a142067b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100065
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 4e85452b174d..0b8b642abc97 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1448,27 +1448,8 @@ void XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
     if ( xAutoStylesSupp.is() )
     {
         Reference< XAutoStyles > xAutoStyleFamilies = xAutoStylesSupp->getAutoStyles();
-        OUString sName;
-        XmlStyleFamily nFamily;
-
-        for ( int i = 0; i < 3; ++i )
-        {
-            if ( 0 == i )
-            {
-                sName = "CharacterStyles" ;
-                nFamily = XmlStyleFamily::TEXT_TEXT;
-            }
-            else if ( 1 == i )
-            {
-                sName = "RubyStyles" ;
-                nFamily = XmlStyleFamily::TEXT_RUBY;
-            }
-            else
-            {
-                sName = "ParagraphStyles" ;
-                nFamily = XmlStyleFamily::TEXT_PARAGRAPH;
-            }
-
+        const auto collectFamily = [this, &xAutoStyleFamilies](const OUString& sName,
+                                                               XmlStyleFamily nFamily) {
             Any aAny = xAutoStyleFamilies->getByName( sName );
             Reference< XAutoStyleFamily > xAutoStyles = *o3tl::doAccess<Reference<XAutoStyleFamily>>(aAny);
             Reference < XEnumeration > xAutoStylesEnum( xAutoStyles->createEnumeration() );
@@ -1480,7 +1461,10 @@ void XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
                 Reference < XPropertySet > xPSet( xAutoStyle, uno::UNO_QUERY );
                 Add( nFamily, xPSet, nullptr, true );
             }
-        }
+        };
+        collectFamily("CharacterStyles", XmlStyleFamily::TEXT_TEXT);
+        collectFamily("RubyStyles", XmlStyleFamily::TEXT_RUBY);
+        collectFamily("ParagraphStyles", XmlStyleFamily::TEXT_PARAGRAPH);
     }
 
     // Export Field AutoStyles: