Redundant null checks

Change-Id: I8b38d37de6cba2a29c9d785adf17d65835c8a05d

1 files changed, 6 insertions, 12 deletions

diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index b812393a254e..e0befd3cd957 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -69,18 +69,14 @@ SmartTagMgr::~SmartTagMgr()
 
 void SmartTagMgr::Init( const OUString& rConfigurationGroupName )
 {
-    // get component context to pass to components:
-    if ( mxContext.is() )
-    {
-        PrepareConfiguration( rConfigurationGroupName );
-        ReadConfiguration( true, true );
-        RegisterListener();
-        LoadLibraries();
-    }
+    PrepareConfiguration( rConfigurationGroupName );
+    ReadConfiguration( true, true );
+    RegisterListener();
+    LoadLibraries();
 }
 void SmartTagMgr::CreateBreakIterator() const
 {
-    if ( !mxBreakIter.is() && mxContext.is() )
+    if ( !mxBreakIter.is() )
     {
         // get the break iterator
         mxBreakIter.set( BreakIterator::create(mxContext) );
@@ -345,9 +341,7 @@ void SmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( Run
 */
 void SmartTagMgr::LoadLibraries()
 {
-    Reference< container::XContentEnumerationAccess > rContent( mxContext->getServiceManager(), UNO_QUERY );
-    if ( !rContent.is() )
-        return;
+    Reference< container::XContentEnumerationAccess > rContent( mxContext->getServiceManager(), UNO_QUERY_THROW );
 
     // load recognizers: No recognizers -> nothing to do.
     Reference < container::XEnumeration > rEnum = rContent->createContentEnumeration( "com.sun.star.smarttags.SmartTagRecognizer");