diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-05-09 13:46:19 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-05-09 13:46:19 +0200 |
| commit | 2b0244db8b223780e9d740ac600b7e25a2c11d93 (patch) | |
| tree | 32a2e624dca4d4f2e9a9a3688d2ce6bbe6f9ef7a /sw/source/filter/basflt/fltini.cxx | |
| parent | 4ae4c57caab02c5d8fe91cd9956fabba6bd3dc1e (diff) | |
Removed unnecessary SvLibrary
Change-Id: I42e64af8ed88e652341707d5f9d2da3daaa0f9bb
Diffstat (limited to 'sw/source/filter/basflt/fltini.cxx')
| -rw-r--r-- | sw/source/filter/basflt/fltini.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
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; |