[Libreoffice-commits] core.git: 4 commits - basic/source oox/source solenv/bin vcl/inc vcl/ios

[Libreoffice Gerrit user]

 basic/source/sbx/sbxscan.cxx     |    2 +-
 oox/source/crypto/CryptTools.cxx |    6 ++++--
 solenv/bin/native-code.py        |    1 +
 vcl/inc/headless/svpgdi.hxx      |    3 ++-
 vcl/inc/ios/iosinst.hxx          |    2 +-
 vcl/ios/iosinst.cxx              |    7 ++++---
 6 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 1721e474e8944e69e3f100c8003d40734123d323
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Mon Aug 27 20:13:08 2018 +0300
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Mon Aug 27 22:29:49 2018 +0300

    Avoid 'HAVE_FEATURE_GPGME' is not defined, evaluates to 0 [-Werror,-Wundef]
    
    Change-Id: Ic788c84171747c31a686da7c523da72b0f838742

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 06c16550b8b0..0056fb1a6dc3 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -470,6 +470,7 @@ print ("""/*
  */
 
 #include <config_features.h>
+#include <config_gpgme.h>
 #include <osl/detail/component-mapping.h>
 
 """)
commit 71527a308a4b32284830911a055087d05d078a71
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Mon Aug 27 17:34:56 2018 +0300
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Mon Aug 27 22:29:49 2018 +0300

    Fix iOS build after f05f4e042ca6ac8ae7f1d1e8e6bfb4cbba17a044
    
    Change-Id: I7b0c737b84f4528a8fba01e2998f525046834b1c

diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 58761d0fcb1a..8877b2ebf201 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -24,7 +24,6 @@
 #include <vcl/sysdata.hxx>
 #include <vcl/metric.hxx>
 #include <config_cairo_canvas.h>
-#include <cairo.h>
 
 #include <salgdi.hxx>
 #include <sallayout.hxx>
@@ -35,6 +34,8 @@
 #define SvpSalGraphics AquaSalGraphics
 #else
 
+#include <cairo.h>
+
 //Using formats that match cairo's formats. For android we patch cairo,
 //which is internal in that case, to swap the rgb components so that
 //cairo then matches the OpenGL GL_RGBA format so we can use it there
diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx
index 262ef1063076..478ea5c47859 100644
--- a/vcl/inc/ios/iosinst.hxx
+++ b/vcl/inc/ios/iosinst.hxx
@@ -33,7 +33,7 @@ class IosSalFrame;
 class IosSalInstance : public SvpSalInstance
 {
 public:
-    IosSalInstance( SalYieldMutex *pMutex );
+    IosSalInstance( std::unique_ptr<SalYieldMutex> pMutex );
     virtual ~IosSalInstance();
     static IosSalInstance *getInstance();
 
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 749541bf964a..588fa07f8a2a 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -25,6 +25,7 @@
 #include "headless/svpdummies.hxx"
 #include "unx/gendata.hxx"
 #include "quartz/utils.h"
+#include <o3tl/make_unique.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/settings.hxx>
 
@@ -58,8 +59,8 @@ IosSalInstance *IosSalInstance::getInstance()
     return static_cast<IosSalInstance *>(pData->m_pInstance);
 }
 
-IosSalInstance::IosSalInstance( SalYieldMutex *pMutex )
-    : SvpSalInstance( pMutex )
+IosSalInstance::IosSalInstance( std::unique_ptr<SalYieldMutex> pMutex )
+    : SvpSalInstance( std::move(pMutex) )
 {
 }
 
@@ -170,7 +171,7 @@ SalData::~SalData()
 // This is our main entry point:
 SalInstance *CreateSalInstance()
 {
-    IosSalInstance* pInstance = new IosSalInstance( new SvpSalYieldMutex() );
+    IosSalInstance* pInstance = new IosSalInstance( o3tl::make_unique<SvpSalYieldMutex>() );
     new IosSalData( pInstance );
     pInstance->AcquireYieldMutex();
     return pInstance;
commit 823a328a04167935be38203ae05181ec5eb9b386
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Mon Aug 27 15:24:57 2018 +0300
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Mon Aug 27 22:29:49 2018 +0300

    Fix build in the !(USE_TLS_OPENSSL + USE_TLS_NSS > 0) case
    
    Change-Id: I746f0f322082e81cc47322989634322a0659aa73

diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
index 9ffc6eabfe47..ffe548d5912e 100644
--- a/oox/source/crypto/CryptTools.cxx
+++ b/oox/source/crypto/CryptTools.cxx
@@ -456,14 +456,16 @@ bool CryptoHash::update(std::vector<sal_uInt8>& rInput, sal_uInt32 nInputLength)
 #if USE_TLS_OPENSSL + USE_TLS_NSS > 0
     sal_uInt32 nActualInputLength = (nInputLength == 0 || nInputLength > rInput.size()) ? rInput.size() : nInputLength;
 #else
-    (void)input;
-    (void)inputLength;
+    (void)rInput;
+    (void)nInputLength;
 #endif
 
 #if USE_TLS_OPENSSL
     return HMAC_Update(mpImpl->mpHmacContext.get(), rInput.data(), nActualInputLength) != 0;
 #elif USE_TLS_NSS
     return PK11_DigestOp(mpImpl->mContext, rInput.data(), nActualInputLength) == SECSuccess;
+#else
+    return false; // ???
 #endif
 }
 
commit 57ba456786614348e309ad1860219ace2f2a2e0b
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Mon Aug 27 15:00:20 2018 +0300
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Mon Aug 27 22:29:49 2018 +0300

    Fix warning in !HAVE_FEATURE_SCRIPTING case
    
    Change-Id: Ibc2a9d4426e9ef09eb874e7a9fef0ea31cad56d5

diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 156a398a7bcf..081d5b4735a5 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -615,6 +615,7 @@ struct VbaFormatInfo
     const char* mpOOoFormat;     // if meType = VbaFormatType::UserDefined
 };
 
+#if HAVE_FEATURE_SCRIPTING
 const VbaFormatInfo pFormatInfoTable[] =
 {
     { VbaFormatType::Offset,      OUStringLiteral("Long Date"),   NF_DATE_SYSTEM_LONG,    nullptr },
@@ -630,7 +631,6 @@ const VbaFormatInfo pFormatInfoTable[] =
     { VbaFormatType::Null,        OUStringLiteral(""),            NF_INDEX_TABLE_ENTRIES, nullptr }
 };
 
-#if HAVE_FEATURE_SCRIPTING
 const VbaFormatInfo* getFormatInfo( const OUString& rFmt )
 {
     const VbaFormatInfo* pInfo = pFormatInfoTable;