From 2b0244db8b223780e9d740ac600b7e25a2c11d93 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 9 May 2012 13:46:19 +0200
Subject: Removed unnecessary SvLibrary

Change-Id: I42e64af8ed88e652341707d5f9d2da3daaa0f9bb
---
 sw/source/filter/basflt/fltini.cxx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'sw/source')

diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 2fe88b73baed..35e7d2fefeca 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -67,7 +67,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XMacroExpander.hpp>
 #include <rtl/uri.hxx>
-#include <tools/svlibrary.hxx>
 
 using namespace utl;
 using rtl::OUString;
@@ -162,9 +161,11 @@ Filters::~Filters()
 
 oslGenericFunction Filters::GetMswordLibSymbol( const char *pSymbol )
 {
-    static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "msword" ) ) );
     if (!msword_.is())
-        SvLibrary::LoadModule( msword_, aLibName, &thisModule, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY );
+    {
+        bool ok = msword_.loadRelative( &thisModule, SVLIBRARY( "msword" ), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY );
+        SAL_WARN_IF(!ok, "sw", "failed to load msword library");
+    }
     if (msword_.is())
         return msword_.getFunctionSymbol( ::rtl::OUString::createFromAscii( pSymbol ) );
     return NULL;
-- 
cgit