loplugin:flatten in xml/transform

Change-Id: Ib428dca2e0afffd53f2f3a2c66682b60e8be43b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100190
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 96 insertions, 97 deletions

diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index e975ba3099ca..e2e196b6a1de 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -49,24 +49,24 @@ public:
 
 XMLTransformerOASISEventMap_Impl::XMLTransformerOASISEventMap_Impl( XMLTransformerEventMapEntry const *pInit )
 {
-    if( pInit )
+    if( !pInit )
+        return;
+
+    XMLTransformerOASISEventMap_Impl::key_type aKey;
+    XMLTransformerOASISEventMap_Impl::mapped_type aData;
+    while( pInit->m_pOASISName )
     {
-        XMLTransformerOASISEventMap_Impl::key_type aKey;
-        XMLTransformerOASISEventMap_Impl::mapped_type aData;
-        while( pInit->m_pOASISName )
-        {
-            aKey.m_nPrefix = pInit->m_nOASISPrefix;
-            aKey.m_aLocalName = OUString::createFromAscii(pInit->m_pOASISName);
+        aKey.m_nPrefix = pInit->m_nOASISPrefix;
+        aKey.m_aLocalName = OUString::createFromAscii(pInit->m_pOASISName);
 
-            OSL_ENSURE( find( aKey ) == end(), "duplicate event map entry" );
+        OSL_ENSURE( find( aKey ) == end(), "duplicate event map entry" );
 
-            aData = OUString::createFromAscii(pInit->m_pOOoName);
+        aData = OUString::createFromAscii(pInit->m_pOOoName);
 
-            XMLTransformerOASISEventMap_Impl::value_type aVal( aKey, aData );
+        XMLTransformerOASISEventMap_Impl::value_type aVal( aKey, aData );
 
-            insert( aVal );
-            ++pInit;
-        }
+        insert( aVal );
+        ++pInit;
     }
 }
 
diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx
index e5b191ee9595..390745064d4d 100644
--- a/xmloff/source/transform/FormPropOASISTContext.cxx
+++ b/xmloff/source/transform/FormPropOASISTContext.cxx
@@ -179,28 +179,27 @@ void XMLFormPropOASISTransformerContext::StartElement(
 
     if( !m_bIsListValue )
         XMLRenameElemTransformerContext::StartElement( xAttrList );
-    if( !m_bIsList )
-    {
-        pMutableAttrList =
-            new XMLMutableAttributeList;
-        xAttrList = pMutableAttrList;
-        if( bIsVoid )
-        {
-            OUString aNewAttrQName(
-                GetTransformer().GetNamespaceMap().GetQNameByKey(
-                    XML_NAMESPACE_FORM, GetXMLToken( XML_PROPERTY_IS_VOID ) ) );
-            pMutableAttrList->AddAttribute( aNewAttrQName,
-                                        GetXMLToken( XML_TRUE ) );
-        }
+    if( m_bIsList )
+        return;
 
-        OUString aValueElemQName(
+    pMutableAttrList = new XMLMutableAttributeList;
+    xAttrList = pMutableAttrList;
+    if( bIsVoid )
+    {
+        OUString aNewAttrQName(
             GetTransformer().GetNamespaceMap().GetQNameByKey(
-                    XML_NAMESPACE_FORM, GetXMLToken( XML_PROPERTY_VALUE ) ) );
-        GetTransformer().GetDocHandler()->startElement( aValueElemQName,
-                                                        xAttrList );
-        GetTransformer().GetDocHandler()->characters( aValue );
-        GetTransformer().GetDocHandler()->endElement( aValueElemQName );
+                XML_NAMESPACE_FORM, GetXMLToken( XML_PROPERTY_IS_VOID ) ) );
+        pMutableAttrList->AddAttribute( aNewAttrQName,
+                                    GetXMLToken( XML_TRUE ) );
     }
+
+    OUString aValueElemQName(
+        GetTransformer().GetNamespaceMap().GetQNameByKey(
+                XML_NAMESPACE_FORM, GetXMLToken( XML_PROPERTY_VALUE ) ) );
+    GetTransformer().GetDocHandler()->startElement( aValueElemQName,
+                                                    xAttrList );
+    GetTransformer().GetDocHandler()->characters( aValue );
+    GetTransformer().GetDocHandler()->endElement( aValueElemQName );
 }
 
 void XMLFormPropOASISTransformerContext::EndElement()
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index 656d9050d156..ccf445adbe9a 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -978,19 +978,19 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
         pProtectContext->AddAttribute( GetTransformer().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_STYLE, GetXMLToken( XML_PROTECT ) ), aProtectAttrValue );
     }
 
-    if( pIntervalMinorDivisorContext )
+    if( !pIntervalMinorDivisorContext )
+        return;
+
+    if( fIntervalMinor != 0.0 )
     {
-        if( fIntervalMinor != 0.0 )
-        {
-            sal_Int32 nIntervalMinorDivisor = static_cast< sal_Int32 >(
-                ::rtl::math::round( fIntervalMajor / fIntervalMinor ));
-
-            pIntervalMinorDivisorContext->AddAttribute(
-                GetTransformer().GetNamespaceMap().GetQNameByKey(
-                    XML_NAMESPACE_CHART,
-                    GetXMLToken( XML_INTERVAL_MINOR_DIVISOR )),
-                OUString::number( nIntervalMinorDivisor ));
-        }
+        sal_Int32 nIntervalMinorDivisor = static_cast< sal_Int32 >(
+            ::rtl::math::round( fIntervalMajor / fIntervalMinor ));
+
+        pIntervalMinorDivisorContext->AddAttribute(
+            GetTransformer().GetNamespaceMap().GetQNameByKey(
+                XML_NAMESPACE_CHART,
+                GetXMLToken( XML_INTERVAL_MINOR_DIVISOR )),
+            OUString::number( nIntervalMinorDivisor ));
     }
 }
 
diff --git a/xmloff/source/transform/TransformerActions.cxx b/xmloff/source/transform/TransformerActions.cxx
index 5db6b96bd545..870822f40828 100644
--- a/xmloff/source/transform/TransformerActions.cxx
+++ b/xmloff/source/transform/TransformerActions.cxx
@@ -28,26 +28,26 @@ using namespace ::com::sun::star::uno;
 
 XMLTransformerActions::XMLTransformerActions( XMLTransformerActionInit const *pInit )
 {
-    if( pInit )
+    if( !pInit )
+        return;
+
+    XMLTransformerActions::key_type aKey;
+    XMLTransformerActions::mapped_type aData;
+    while( pInit->m_nActionType != XML_TACTION_EOT )
     {
-        XMLTransformerActions::key_type aKey;
-        XMLTransformerActions::mapped_type aData;
-        while( pInit->m_nActionType != XML_TACTION_EOT )
-        {
-            aKey.m_nPrefix = pInit->m_nPrefix;
-            aKey.SetLocalName( pInit->m_eLocalName );
+        aKey.m_nPrefix = pInit->m_nPrefix;
+        aKey.SetLocalName( pInit->m_eLocalName );
 
-            OSL_ENSURE( find( aKey ) == end(), "duplicate action map entry" );
+        OSL_ENSURE( find( aKey ) == end(), "duplicate action map entry" );
 
-            aData.m_nActionType  = pInit->m_nActionType;
-            aData.m_nParam1 = pInit->m_nParam1;
-            aData.m_nParam2 = pInit->m_nParam2;
-            aData.m_nParam3 = pInit->m_nParam3;
-            XMLTransformerActions::value_type aVal( aKey, aData );
+        aData.m_nActionType  = pInit->m_nActionType;
+        aData.m_nParam1 = pInit->m_nParam1;
+        aData.m_nParam2 = pInit->m_nParam2;
+        aData.m_nParam3 = pInit->m_nParam3;
+        XMLTransformerActions::value_type aVal( aKey, aData );
 
-            insert( aVal );
-            ++pInit;
-        }
+        insert( aVal );
+        ++pInit;
     }
 }
 
@@ -57,27 +57,27 @@ XMLTransformerActions::~XMLTransformerActions()
 
 void XMLTransformerActions::Add( XMLTransformerActionInit const *pInit )
 {
-    if( pInit )
+    if( !pInit )
+        return;
+
+    XMLTransformerActions::key_type aKey;
+    XMLTransformerActions::mapped_type aData;
+    while( pInit->m_nActionType != XML_TACTION_EOT )
     {
-        XMLTransformerActions::key_type aKey;
-        XMLTransformerActions::mapped_type aData;
-        while( pInit->m_nActionType != XML_TACTION_EOT )
+        aKey.m_nPrefix = pInit->m_nPrefix;
+        aKey.SetLocalName( pInit->m_eLocalName );
+        XMLTransformerActions::iterator aIter = find( aKey );
+        if( aIter == end() )
         {
-            aKey.m_nPrefix = pInit->m_nPrefix;
-            aKey.SetLocalName( pInit->m_eLocalName );
-            XMLTransformerActions::iterator aIter = find( aKey );
-            if( aIter == end() )
-            {
-                aData.m_nActionType  = pInit->m_nActionType;
-                aData.m_nParam1 = pInit->m_nParam1;
-                aData.m_nParam2 = pInit->m_nParam2;
-                aData.m_nParam3 = pInit->m_nParam3;
-                XMLTransformerActions::value_type aVal( aKey, aData );
-                insert( aVal );
-            }
-
-            ++pInit;
+            aData.m_nActionType  = pInit->m_nActionType;
+            aData.m_nParam1 = pInit->m_nParam1;
+            aData.m_nParam2 = pInit->m_nParam2;
+            aData.m_nParam3 = pInit->m_nParam3;
+            XMLTransformerActions::value_type aVal( aKey, aData );
+            insert( aVal );
         }
+
+        ++pInit;
     }
 }
 
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 2114b3420be0..bac4b993073f 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -297,33 +297,33 @@ rName
 #endif
 )
 {
-    if( !m_vContexts.empty() )
-    {
-        // Get topmost context
-        ::rtl::Reference< XMLTransformerContext > xContext = m_vContexts.back();
+    if( m_vContexts.empty() )
+        return;
+
+    // Get topmost context
+    ::rtl::Reference< XMLTransformerContext > xContext = m_vContexts.back();
 
 #if OSL_DEBUG_LEVEL > 0
-        OSL_ENSURE( xContext->GetQName() == rName,
-                "XMLTransformerBase::endElement: popped context has wrong lname" );
+    OSL_ENSURE( xContext->GetQName() == rName,
+            "XMLTransformerBase::endElement: popped context has wrong lname" );
 #endif
 
-        // Call a EndElement at the current context.
-        xContext->EndElement();
+    // Call a EndElement at the current context.
+    xContext->EndElement();
 
-        // and remove it from the stack.
-        m_vContexts.pop_back();
+    // and remove it from the stack.
+    m_vContexts.pop_back();
 
-        // Get a namespace map to rewind.
-        std::unique_ptr<SvXMLNamespaceMap> pRewindMap = xContext->TakeRewindMap();
+    // Get a namespace map to rewind.
+    std::unique_ptr<SvXMLNamespaceMap> pRewindMap = xContext->TakeRewindMap();
 
-        // Delete the current context.
-        xContext = nullptr;
+    // Delete the current context.
+    xContext = nullptr;
 
-        // Rewind a namespace map.
-        if( pRewindMap )
-        {
-            m_pNamespaceMap = std::move( pRewindMap );
-        }
+    // Rewind a namespace map.
+    if( pRewindMap )
+    {
+        m_pNamespaceMap = std::move( pRewindMap );
     }
 }