From ddcf2363bad1d84874dfe4e31e4783ffd761d5bb Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 30 Oct 2012 11:40:18 +0100
Subject: fdo#46808: Improve previous commit

* Removing m_xLngMgr.is() check from SfxThesSubMenuHelper::GetThesImplName was
  unsound with SfxThesSubMenuHelper ctor swallowing Exception; best fix appears
  to be to remove the swallowing.

* Prefer forward declarations over #includes.

Change-Id: Ie4e7dcd6cdb14046516d119605bbf78e81359768
---
 sfx2/source/menu/thessubmenu.cxx | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'sfx2')

diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx
index 1a645885adb1..f4c5f474efce 100644
--- a/sfx2/source/menu/thessubmenu.cxx
+++ b/sfx2/source/menu/thessubmenu.cxx
@@ -64,18 +64,12 @@ void SfxThesSubMenuHelper::GetLocale(
 }
 
 
-SfxThesSubMenuHelper::SfxThesSubMenuHelper()
+SfxThesSubMenuHelper::SfxThesSubMenuHelper():
+    m_xLngMgr(
+        linguistic2::LinguServiceManager::create(
+            comphelper::getProcessComponentContext())),
+    m_xThesarus(m_xLngMgr->getThesaurus())
 {
-    try
-    {
-        uno::Reference< uno::XComponentContext >  xContext( ::comphelper::getProcessComponentContext() );
-        m_xLngMgr = linguistic2::LinguServiceManager::create(xContext);
-        m_xThesarus = m_xLngMgr->getThesaurus();
-    }
-    catch (const uno::Exception &)
-    {
-        DBG_ASSERT( 0, "failed to get thesaurus" );
-    }
 }
 
 
-- 
cgit v1.2.3