[Libreoffice-commits] core.git: sw/source

[Stephan Bergmann]

 sw/source/filter/basflt/fltini.cxx |   16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

New commits:
commit 5da5340a9f3dc938060323bda430ff671833d58f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 24 14:40:16 2014 +0200

    Cater for gb_CppunitTest_use_library_objects,*,sw
    
    ...where the msword lib would not be located next to the test lib.  Probably
    cleaner this way anyway.
    
    Change-Id: I083503ef61fa8b6eabf6966a8a98bc7a225749eb

diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index fca7555..74a4dc9 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -56,7 +56,7 @@
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XMacroExpander.hpp>
-#include <rtl/uri.hxx>
+#include <rtl/bootstrap.hxx>
 
 using namespace utl;
 using namespace com::sun::star::uno;
@@ -113,16 +113,6 @@ inline void _SetFltPtr( sal_uInt16 rPos, SwRead pReader )
         aReaderWriter[ rPos ].pReader = pReader;
 }
 
-namespace {
-
-#ifndef DISABLE_DYNLOADING
-
-extern "C" { static void SAL_CALL thisModule() {} }
-
-#endif
-
-}
-
 namespace sw {
 
 Filters::Filters()
@@ -151,7 +141,9 @@ oslGenericFunction Filters::GetMswordLibSymbol( const char *pSymbol )
 {
     if (!msword_.is())
     {
-        bool ok = msword_.loadRelative( &thisModule, SVLIBRARY( "msword" ), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY );
+        OUString url("$LO_LIB_DIR/" SVLIBRARY("msword"));
+        rtl::Bootstrap::expandMacros(url);
+        bool ok = msword_.load( url, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY );
         SAL_WARN_IF(!ok, "sw", "failed to load msword library");
     }
     if (msword_.is())