coverity#704365 Logically dead code

Change-Id: I8981dfcd3f8c0fcf0ad84bbe87a6d40c1a1a49db

1 files changed, 23 insertions, 27 deletions

diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 448b54858aa3..0c1f0a441bcb 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -863,38 +863,34 @@ void SwXStyleFamily::insertByName(const OUString& rName, const uno::Any& rElemen
                     pNewStyle = reinterpret_cast< SwXStyle * >(
                             sal::static_int_cast< sal_IntPtr >( xStyleTunnel->getSomething( SwXStyle::getUnoTunnelId()) ));
                 }
-                if(!pNewStyle || !pNewStyle->IsDescriptor() ||
-                    pNewStyle->GetFamily() != eFamily)
-                        throw lang::IllegalArgumentException();
-                if(pNewStyle)
-                {
-                    sal_uInt16 nMask = SFXSTYLEBIT_ALL;
-                    if(eFamily == SFX_STYLE_FAMILY_PARA && !pNewStyle->IsConditional())
-                        nMask &= ~SWSTYLEBIT_CONDCOLL;
+
+                if (!pNewStyle || !pNewStyle->IsDescriptor() || pNewStyle->GetFamily() != eFamily)
+                    throw lang::IllegalArgumentException();
+
+                sal_uInt16 nMask = SFXSTYLEBIT_ALL;
+                if(eFamily == SFX_STYLE_FAMILY_PARA && !pNewStyle->IsConditional())
+                    nMask &= ~SWSTYLEBIT_CONDCOLL;
 #if OSL_DEBUG_LEVEL > 1
-                    SfxStyleSheetBase& rNewBase =
+                SfxStyleSheetBase& rNewBase =
 #endif
-                    pBasePool->Make(sStyleName, eFamily, nMask);
-                    pNewStyle->SetDoc(pDocShell->GetDoc(), pBasePool);
-                    pNewStyle->SetStyleName(sStyleName);
-                    const OUString sParentStyleName(pNewStyle->GetParentStyleName());
-                    if (!sParentStyleName.isEmpty())
-                    {
-                        pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
-                        SfxStyleSheetBase* pParentBase = pBasePool->Find(sParentStyleName);
-                        if(pParentBase && pParentBase->GetFamily() == eFamily &&
-                            &pParentBase->GetPool() == pBasePool)
-                            pBasePool->SetParent( eFamily, sStyleName, sParentStyleName );
+                pBasePool->Make(sStyleName, eFamily, nMask);
+                pNewStyle->SetDoc(pDocShell->GetDoc(), pBasePool);
+                pNewStyle->SetStyleName(sStyleName);
+                const OUString sParentStyleName(pNewStyle->GetParentStyleName());
+                if (!sParentStyleName.isEmpty())
+                {
+                    pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
+                    SfxStyleSheetBase* pParentBase = pBasePool->Find(sParentStyleName);
+                    if(pParentBase && pParentBase->GetFamily() == eFamily &&
+                        &pParentBase->GetPool() == pBasePool)
+                        pBasePool->SetParent( eFamily, sStyleName, sParentStyleName );
 
-                    }
+                }
 #if OSL_DEBUG_LEVEL > 1
-                    (void)rNewBase;
+                (void)rNewBase;
 #endif
-                    //so, jetzt sollten noch die Properties des Descriptors angewandt werden
-                    pNewStyle->ApplyDescriptorProperties();
-                }
-                else
-                    throw lang::IllegalArgumentException();
+                //so, jetzt sollten noch die Properties des Descriptors angewandt werden
+                pNewStyle->ApplyDescriptorProperties();
             }
             else
                 throw lang::IllegalArgumentException();