[Libreoffice-commits] .: 2 commits - cui/source lotuswordpro/source

[Tor Lillqvist]

 cui/source/customize/acccfg.cxx          |   12 ++++++------
 lotuswordpro/source/filter/lwpfilter.cxx |    1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit f9595ad5153ff3f98f9a36f3307aef4ecb62110d
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Feb 13 14:00:29 2012 +0200

    WaE: unreferenced local variable

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 5c79188..9ed0741 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -884,7 +884,7 @@ void SfxAcceleratorConfigPage::InitAccCfg()
         css::uno::Reference< css::ui::XUIConfigurationManager > xUICfgManager = xModuleCfgSupplier->getUIConfigurationManager(m_sModuleLongName);
         m_xModule = css::uno::Reference< css::ui::XAcceleratorConfiguration >(xUICfgManager->getShortCutManager(), css::uno::UNO_QUERY_THROW);
     }
-    catch(const css::uno::RuntimeException& exRun)
+    catch(const css::uno::RuntimeException&)
         { throw; }
     catch(const css::uno::Exception&)
         { m_xSMGR.clear(); }
@@ -1020,7 +1020,7 @@ void SfxAcceleratorConfigPage::Apply(const css::uno::Reference< css::ui::XAccele
             else
                 xAccMgr->removeKeyEvent(aAWTKey);
         }
-        catch(const css::uno::RuntimeException& exRun)
+        catch(const css::uno::RuntimeException&)
             { throw; }
         catch(const css::uno::Exception&)
             {}
@@ -1298,7 +1298,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*, EMPTYARG
                 xComponent->dispose();
         }
     }
-    catch(const css::uno::RuntimeException& exRun)
+    catch(const css::uno::RuntimeException&)
         { throw; }
     catch(const css::uno::Exception&)
         {}
@@ -1400,7 +1400,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, EMPTYARG
                 xComponent->dispose();
         }
     }
-    catch(const css::uno::RuntimeException& exRun)
+    catch(const css::uno::RuntimeException&)
         { throw; }
     catch(const css::uno::Exception&)
         {}
@@ -1437,7 +1437,7 @@ sal_Bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet& )
     {
         m_xAct->store();
     }
-    catch(const css::uno::RuntimeException& exRun)
+    catch(const css::uno::RuntimeException&)
         { throw;  }
     catch(const css::uno::Exception&)
         { return sal_False; }
@@ -1526,7 +1526,7 @@ String SfxAcceleratorConfigPage::GetLabel4Command(const String& sCommand)
                 return sLabel;
         }
     }
-    catch(const css::uno::RuntimeException& exRun)
+    catch(const css::uno::RuntimeException&)
         { throw; }
     catch(const css::uno::Exception&)
         {}
commit a52f348700adec5ede76a62381f8d54cb5588da8
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Feb 13 13:54:25 2012 +0200

    WaE: unreachable code

diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index f28493a..1f66f94 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -421,7 +421,6 @@ int ReadWordproFile(SvStream &rStream, uno::Reference<XDocumentHandler>& xHandle
     {
         return 1;
     }
-    return 1;
 }
 
 void ErrorMsg(int /*iErrCode*/)