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

[Tor Lillqvist]

 lotuswordpro/source/filter/lwptblformula.cxx |   27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

New commits:
commit 5cd23da971f10d1367acaabf528d14f0374fedc3
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 16 16:08:46 2017 +0300

    WaE: C4702: unreachable code
    
    Change-Id: Ic7e21ab6718c246f9fa3ae127827d8d6a1bdbbc3
    Reviewed-on: https://gerrit.libreoffice.org/41213
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index 8e352e5c8b8d..71fb413da82d 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -80,16 +80,11 @@ LwpFormulaArg::~LwpFormulaArg()
 
 LwpFormulaInfo::~LwpFormulaInfo()
 {
-    try{
-        while(m_aStack.size()>0)
-        {
-            LwpFormulaArg* pArg=m_aStack.back();
-            m_aStack.pop_back();
-            delete pArg; pArg=nullptr;
-        }
-    }catch (...)
+    while(m_aStack.size()>0)
     {
-        assert(false);
+        LwpFormulaArg* pArg=m_aStack.back();
+        m_aStack.pop_back();
+        delete pArg; pArg=nullptr;
     }
 }
 
@@ -420,18 +415,12 @@ LwpFormulaFunc::LwpFormulaFunc(sal_uInt16 nTokenType)
 
 LwpFormulaFunc::~LwpFormulaFunc()
 {
-    try
+    while(m_aArgs.size()>0)
     {
-        while(m_aArgs.size()>0)
-        {
-            LwpFormulaArg* pArg = m_aArgs.back();
-            m_aArgs.pop_back();
-            delete pArg;pArg=nullptr;
-        }
-    }catch (...) {
-        assert(false);
+        LwpFormulaArg* pArg = m_aArgs.back();
+        m_aArgs.pop_back();
+        delete pArg;pArg=nullptr;
     }
-
 }
 void LwpFormulaFunc::AddArg(LwpFormulaArg* pArg)
 {