[Libreoffice-commits] core.git: 2 commits - external/libetonyek sfx2/source

[Caolán McNamara]

 external/libetonyek/UnpackedTarball_libetonyek.mk |    1 
 external/libetonyek/initial-creator.patch.1       |   26 ++++++++++++++++++++++
 sfx2/source/appl/appinit.cxx                      |    2 -
 3 files changed, 28 insertions(+), 1 deletion(-)

New commits:
commit c5ab53e3a143b7090e0bf024dff6dd9fb50c2a67
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 23 16:35:57 2018 +0100

    type mismatch at 1st parameter ('vcl::Window *const' vs 'const vcl::Window *')
    
    Change-Id: I4e72c5c66b3826f00ad65da81f253c32ca9cdcbb
    Reviewed-on: https://gerrit.libreoffice.org/53334
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 49a4ca54c1d4..3771047e805e 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -141,7 +141,7 @@ Sequence< OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceName
 }
 
 
-typedef bool ( *PFunc_getSpecialCharsForEdit)( vcl::Window* const i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString );
+typedef bool ( *PFunc_getSpecialCharsForEdit)( vcl::Window const * i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString );
 
 
 // Lazy binding of the GetSpecialCharsForEdit function as it resides in
commit 46d7ea280c03776f7781fac97db29f431725a5c8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 23 17:30:04 2018 +0100

    crashtesting: assert on export of fdo72030-2.key, fix typo
    
    Change-Id: Id7ef38be46f7d2ff1de1f3124d4fa82258b086a2
    Reviewed-on: https://gerrit.libreoffice.org/53339
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index d64d7e45212b..d90e44955687 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
 	external/libetonyek/ubsan.patch \
 	external/libetonyek/rpath.patch \
 	external/libetonyek/warnings.patch \
+	external/libetonyek/initial-creator.patch.1 \
 ))
 
 ifneq ($(OS),MACOSX)
diff --git a/external/libetonyek/initial-creator.patch.1 b/external/libetonyek/initial-creator.patch.1
new file mode 100644
index 000000000000..44b7b19ea1b3
--- /dev/null
+++ b/external/libetonyek/initial-creator.patch.1
@@ -0,0 +1,26 @@
+From 1a91c62e829a2eda2f5870aae984125ef48ce672 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Mon, 23 Apr 2018 17:20:16 +0100
+Subject: [PATCH] intial-creator->initial-creator
+
+Change-Id: I6fe5d0732edb97ac7ff6d527f48543cab1bb3f7b
+---
+ src/lib/IWORKCollector.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/IWORKCollector.cpp b/src/lib/IWORKCollector.cpp
+index 0e0c775..4252a49 100644
+--- a/src/lib/IWORKCollector.cpp
++++ b/src/lib/IWORKCollector.cpp
+@@ -771,7 +771,7 @@ void IWORKCollector::fillMetadata(librevenge::RVNGPropertyList &props)
+   if (!m_metadata.m_title.empty())
+     props.insert("dc:subject", m_metadata.m_title.c_str());
+   if (!m_metadata.m_author.empty())
+-    props.insert("meta:intial-creator", m_metadata.m_author.c_str());
++    props.insert("meta:initial-creator", m_metadata.m_author.c_str());
+   if (!m_metadata.m_keywords.empty())
+     props.insert("meta:keyword", m_metadata.m_keywords.c_str());
+   if (!m_metadata.m_comment.empty())
+-- 
+2.14.3
+