expand complex cascading conditional operator

Change-Id: I8e489db0dbbd1bb420a3fa477232a86d2cd10b62
Reviewed-on: https://gerrit.libreoffice.org/13007Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

sw/source/core/unocore/unostyle.cxx

@@ -751,10 +751,10 @@ uno::Any SwXStyleFamily::getByName(const OUString& rName)
                         xStyle = new SwXPageStyle(*pBasePool, pDocShell, eFamily, sStyleName);
                         break;
                     case SFX_STYLE_FAMILY_FRAME:
-                        xStyle = new SwXFrameStyle(*pBasePool, pDocShell->GetDoc(), pBase->GetName()):
+                        xStyle = new SwXFrameStyle(*pBasePool, pDocShell->GetDoc(), pBase->GetName());
                         break;
                     default:
-                        new SwXStyle(*pBasePool, eFamily, pDocShell->GetDoc(), sStyleName);
+                        xStyle = new SwXStyle(*pBasePool, eFamily, pDocShell->GetDoc(), sStyleName);
                 }
             }
             aRet.setValue(&xStyle, cppu::UnoType<style::XStyle>::get());

sw/source/filter/ww8/wrtw8sty.cxx

@@ -313,8 +313,11 @@ void MSWordStyles::BuildStyleIds()
 
     for (sal_uInt16 n = 1; n < nUsedSlots; ++n)
     {
-        const OUString aName(pFmtA[n]? pFmtA[n]->GetName(): (m_aNumRules.find(n) != m_aNumRules.end() ? m_aNumRules[n]->GetName() : OUString()));
-
+        OUString aName;
+        if(pFmtA[n])
+            aName = pFmtA[n]->GetName();
+        else if (m_aNumRules.find(n) != m_aNumRules.end())
+            aName = m_aNumRules[n]->GetName();
         OStringBuffer aStyleIdBuf(aName.getLength());
         for (int i = 0; i < aName.getLength(); ++i)
         {