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

Stephan Bergmann sbergman at redhat.com
Thu Dec 19 01:57:35 PST 2013


 cppuhelper/source/shlib.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 023e49921e11644b65af66996fd033c533f589f9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Dec 19 10:56:58 2013 +0100

    Legacy cppu::loadSharedLibComponentFactory isn't DISABLE_DYNLOADING cond.
    
    Change-Id: I020d4fc382470d7bc08df9b88e42ac62c97cb47e

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 972357b..fd88e5b 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -265,8 +265,6 @@ void cppuhelper::detail::loadSharedLibComponentFactory(
 #endif
 }
 
-#if !defined DISABLE_DYNLOADING
-
 css::uno::Reference<css::uno::XInterface> cppu::loadSharedLibComponentFactory(
     rtl::OUString const & uri, rtl::OUString const & rPath,
     rtl::OUString const & rImplName,
@@ -282,6 +280,8 @@ css::uno::Reference<css::uno::XInterface> cppu::loadSharedLibComponentFactory(
     return fac;
 }
 
+#if !defined DISABLE_DYNLOADING
+
 namespace {
 
 extern "C" void writeInfo(va_list * args) {


More information about the Libreoffice-commits mailing list