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

[Caolán McNamara]

 vcl/source/filter/wmf/winmtf.cxx |    3 +++
 vcl/workben/wmftester.cxx        |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4e6369c51bbf59d29e2686d4e5d3b2e8b4393903
Author: Caolán McNamara <caol...@redhat.com>
Date:   Mon Dec 5 12:36:13 2016 +0000

    AvoidConfig fastpath for testing
    
    Change-Id: I50aa865f1b5f0524c2c8af32fa94faea9f6943e9

diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 36aae28..fc4bd6e 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -32,6 +32,7 @@
 #include <o3tl/make_unique.hxx>
 #include "officecfg/Setup.hxx"
 #include "officecfg/Office/Linguistic.hxx"
+#include "unotools/configmgr.hxx"
 #include "unotools/wincodepage.hxx"
 
 #if OSL_DEBUG_LEVEL > 1
@@ -149,6 +150,8 @@ namespace {
 
 OUString getLODefaultLanguage()
 {
+    if (utl::ConfigManager::IsAvoidConfig())
+        return "en-US";
     OUString 
result(officecfg::Office::Linguistic::General::DefaultLocale::get());
     if (result.isEmpty())
         result = officecfg::Setup::L10N::ooSetupSystemLocale::get();
commit 48a46f631a9997ac97aa5de5db2c3b5390ee179a
Author: Caolán McNamara <caol...@redhat.com>
Date:   Mon Dec 5 12:35:55 2016 +0000

    fix LLVMFuzzerInitialize
    
    Change-Id: I238d210bccbf74913b5f2c0ec2de0ac27d93fef6

diff --git a/vcl/workben/wmftester.cxx b/vcl/workben/wmftester.cxx
index 9514cae..e685465 100644
--- a/vcl/workben/wmftester.cxx
+++ b/vcl/workben/wmftester.cxx
@@ -25,7 +25,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace cppu;
 
-int LLVMFuzzerInitialize(int *argc, char ***argv)
+extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv)
 {
     osl_setCommandArgs(*argc, *argv);
 

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits