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

[Eike Rathke]

 vcl/source/window/builder.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit adff6293ce22d84e5a380aa649e7d0f0ffdc4d80
Author: Eike Rathke <er...@redhat.com>
Date:   Tue Feb 13 00:22:44 2018 +0100

    Blind fix for MERGELIBS build
    
    It's g_aMergedLib instead of g_aMergedLibs, and osl::Module is not a
    unique_ptr or somesuch..
    
        commit 707f787cd991f9c59712cd3020d127d09605c792
        AuthorDate: Sun Feb 11 00:01:44 2018 +0100
        CommitDate: Mon Feb 12 22:27:55 2018 +0100
    
    Change-Id: I1f0266d189546dfe3b0d9eb449c878daebbf0da6

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index becc75d63f41..8deda5a66b83 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1115,7 +1115,7 @@ void VclBuilder::preload()
 #ifndef DISABLE_DYNLOADING
 
 #if ENABLE_MERGELIBS
-    g_aMergedLibs->loadRelative(&thisModule, SVLIBRARY("merged"));
+    g_aMergedLib.loadRelative(&thisModule, SVLIBRARY("merged"));
 #endif
 // find -name '*ui*' | xargs grep 'class=".*lo-' |
 //     sed 's/.*class="//' | sed 's/-.*$//' | sort | uniq
@@ -1643,8 +1643,8 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
                 bool ok = false;
 #if ENABLE_MERGELIBS
                 if (!g_aMergedLib.is())
-                    g_aMergedLib->loadRelative(&thisModule, 
SVLIBRARY("merged"));
-                ok = g_aMergedLib->getFunctionSymbol(sFunction);
+                    g_aMergedLib.loadRelative(&thisModule, 
SVLIBRARY("merged"));
+                ok = g_aMergedLib.getFunctionSymbol(sFunction);
 #endif
                 if (!ok)
                     ok = pModule->loadRelative(&thisModule, sModule);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits