[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - 795 commits - accessibility/source avmedia/source basctl/source basic/source bin/distro-install-file-lists bin/find-german-comments bin/findunusedcode bin/update_pch_bisect bridges/source canvas/Library_canvasfactory.mk canvas/source chart2/Library_chartcontroller.mk chart2/qa chart2/source cli_ure/source comphelper/source compilerplugins/clang config_host/config_vclplug.h.in config_host.mk.in configmgr/Library_configmgr.mk configmgr/source configure.ac connectivity/Configuration_kab.mk connectivity/Library_kab1.mk connectivity/Library_kabdrv1.mk connectivity/Module_connectivity.mk connectivity/registry connectivity/source cppcanvas/source cppu/source cui/Library_cui.mk cui/source dbaccess/source desktop/inc desktop/Pagein_common.mk desktop/source desktop/uiconfig dictionaries distro-configs/Jenkins distro-configs/LibreOfficeAndroidAarch64.conf distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf d istro-configs/LibreOfficeCoverity.conf distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/OxygenOfficeLinux.conf download.lst drawinglayer/source dtrans/Library_mcnttype.mk dtrans/test editeng/source extensions/source external/boost external/coinmp external/cppunit external/icu external/libabw external/libcdr external/libebook external/libgltf external/liblangtag external/libmspub external/libmwaw external/libodfgen external/liborcus external/libpagemaker external/librevenge external/libvisio external/libwps external/nss external/poppler external/redland extras/CustomTarget_autocorr.mk extras/CustomTarget_autotextshare.mk extras/CustomTarget_autotextuser.mk extras/source filter/CppunitTest_filter_msfilter.mk filter/CppunitTest_filter_utils.mk filter/Module_filter.mk filter/qa filter/source forms/source formula/source fpicker/source fpicker/test fpicker/uiconfig framework/inc framework/source helpcontent2 hwpfilter/Library_hwp.mk hwpfilter/sour ce i18nlangtag/source i18npool/qa i18npool/source i18nutil/source icon-themes/sifr idlc/source include/basic include/comphelper include/dbaccess include/editeng include/filter include/framework include/i18nlangtag include/linguistic include/o3tl include/oox include/sal include/sfx2 include/svl include/svtools include/svx include/systools include/tools include/vcl include/xmloff instsetoo_native/CustomTarget_setup.mk instsetoo_native/inc_openoffice io/source jvmfwk/plugins jvmfwk/source l10ntools/inc l10ntools/source libreofficekit/source linguistic/inc linguistic/source linguistic/workben lotuswordpro/source m4/introspection.m4 o3tl/qa offapi/com offapi/UnoApi_offapi.mk officecfg/Configuration_officecfg.mk officecfg/registry onlineupdate/source oox/inc oox/source opencl/source package/inc package/source postprocess/CustomTarget_registry.mk postprocess/Rdb_services.mk pyuno/source readlicense_oo/license registry/source reportdesign/inc reportdesign/source RepositoryExternal.mk Reposi tory.mk rsc/inc rsc/source sal/cppunittester sal/Library_uwinapi.mk sal/osl sal/qa sal/systools sal/textenc sal/workben sax/qa sax/source sax/test sc/inc sc/Library_scfilt.mk scp2/InstallModule_gnome.mk scp2/InstallModule_ooo.mk scp2/InstallScript_setup_osl.mk scp2/Module_scp2.mk scp2/source sc/qa scripting/source sc/source sc/uiconfig sc/workben sdext/inc sdext/source sd/inc sd/qa sd/res sd/source sd/workben setup_native/Library_instooofiltmsi.mk setup_native/Library_qslnkmsi.mk setup_native/Library_reg4allmsdoc.mk setup_native/Library_regactivex.mk setup_native/Library_sdqsmsi.mk setup_native/Library_sellangmsi.mk setup_native/Library_shlxtmsi.mk setup_native/Library_sn_tools.mk sfx2/inc sfx2/qa sfx2/source sfx2/uiconfig shell/Library_kdebe.mk shell/Module_shell.mk shell/Package_scripts_kde.mk shell/source slideshow/source solenv/bin solenv/gbuild sot/source starmath/inc starmath/source stoc/source store/source svgio/inc svgio/source svl/source svl/unx svtools/inc svtools/Library_ svt.mk svtools/qa svtools/source svtools/uiconfig svx/inc svx/Library_svxcore.mk svx/source svx/uiconfig sw/CppunitTest_sw_odfexport.mk sw/inc sw/qa sw/source sw/uiconfig sysui/CustomTarget_share.mk sysui/desktop test/source toolkit/source tools/qa tools/source translations ucbhelper/source ucb/Library_ucpgvfs1.mk ucb/Module_ucb.mk ucb/source unoidl/source unotest/source unotools/source unoxml/source uui/source vbahelper/source vcl/CppunitTest_vcl_bitmap_test.mk vcl/CustomTarget_kde_moc.mk vcl/Executable_fftester.mk vcl/Executable_kdefilepicker.mk vcl/Executable_vcldemo.mk vcl/generic vcl/inc vcl/Library_vcl.mk vcl/Library_vclplug_kde.mk vcl/Module_vcl.mk vcl/opengl vcl/osx vcl/Package_opengl.mk vcl/qa vcl/README.vars vcl/source vcl/unx vcl/win vcl/workben winaccessibility/Library_winaccessibility.mk wizards/com wizards/source writerfilter/source writerperfect/inc writerperfect/qa writerperfect/source xmlhelp/source xmloff/inc xmloff/source xmlsecurity/inc xmlsecurity/source

[Pranav Kant]

Rebased ref, commits from common ancestor:
commit c93f706dae2e80dc1ee8f0d4b2ce3127a1387861
Author: Pranav Kant <pran...@gnome.org>
Date:   Thu Aug 20 00:23:58 2015 +0530

    Mark gtk+ calls as critical section
    
    Change-Id: I6166ccc76a574049031b8a8da2ea1a104612c5d1

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 41ec8f0..a2698af 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1249,7 +1249,9 @@ setEditInThread(gpointer data)
     }
     priv->m_bEdit = bEdit;
     g_signal_emit(pDocView, doc_view_signals[EDIT_CHANGED], 0, bWasEdit);
+    gdk_threads_enter();
     gtk_widget_queue_draw(GTK_WIDGET(pDocView));
+    gdk_threads_leave();
 }
 
 static void
@@ -1305,7 +1307,9 @@ paintTileInThread (gpointer data)
     //create a mapping for it
     buffer.m_mTiles[index].setPixbuf(pPixBuf);
     buffer.m_mTiles[index].valid = true;
+    gdk_threads_enter();
     gtk_widget_queue_draw(GTK_WIDGET(pDocView));
+    gdk_threads_leave();
 }
 
 
commit 945c02caaf4e285f6643ecaf9f4c3837a16986c9
Author: Pranav Kant <pran...@gnome.org>
Date:   Sat Aug 15 18:48:53 2015 +0530

    create_tree.sh: Generate g-i files
    
    Change-Id: I1749b5b02018cfe6f85a13aed8de4b31a09788e3

diff --git a/configure.ac b/configure.ac
index 65a313a..dda7e15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,6 +201,11 @@ SRC_ROOT=`pwd`
 cd $BUILDDIR
 x_Cygwin=[\#]
 
+dnl ======================================
+dnl Required GObject introspection version
+dnl ======================================
+INTROSPECTION_REQUIRED_VERSION=1.32.0
+
 dnl ===================================================================
 dnl Search all the common names for GNU Make
 dnl ===================================================================
@@ -9957,6 +9962,7 @@ if test "x$enable_gtk3" = "xyes"; then
     PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.8 gtk+-unix-print-3.0 
gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", 
ENABLE_GTK3="")
     if test "x$ENABLE_GTK3" = "xTRUE"; then
         R="gtk3"
+        GOBJECT_INTROSPECTION_CHECK(INTROSPECTION_REQUIRED_VERSION)
     else
         AC_MSG_ERROR([gtk3 or dependent libraries of the correct versions, not 
found])
     fi
diff --git a/m4/introspection.m4 b/m4/introspection.m4
new file mode 100644
index 0000000..aa7b3b4
--- /dev/null
+++ b/m4/introspection.m4
@@ -0,0 +1,96 @@
+dnl -*- mode: autoconf -*-
+dnl Copyright 2009 Johan Dahlin
+dnl
+dnl This file is free software; the author(s) gives unlimited
+dnl permission to copy and/or distribute it, with or without
+dnl modifications, as long as this notice is preserved.
+dnl
+
+# serial 1
+
+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
+[
+    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
+
+    dnl enable/disable introspection
+    m4_if([$2], [require],
+    [dnl
+        enable_introspection=yes
+    ],[dnl
+        AC_ARG_ENABLE(introspection,
+                  
AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
+                                 [Enable introspection for this build]),,
+                                 [enable_introspection=auto])
+    ])dnl
+
+    AC_MSG_CHECKING([for gobject-introspection])
+
+    dnl presence/version checking
+    AS_CASE([$enable_introspection],
+    [no], [dnl
+        found_introspection="no (disabled, use --enable-introspection to 
enable)"
+    ],dnl
+    [yes],[dnl
+        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
+                         AC_MSG_ERROR([gobject-introspection-1.0 is not 
installed]))
+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
+                         found_introspection=yes,
+                         AC_MSG_ERROR([You need to have gobject-introspection 
>= $1 installed to build AC_PACKAGE_NAME]))
+    ],dnl
+    [auto],[dnl
+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], 
found_introspection=yes, found_introspection=no)
+       dnl Canonicalize enable_introspection
+       enable_introspection=$found_introspection
+    ],dnl
+    [dnl
+        AC_MSG_ERROR([invalid argument passed to --enable-introspection, 
should be one of @<:@no/auto/yes@:>@])
+    ])dnl
+
+    AC_MSG_RESULT([$found_introspection])
+
+    INTROSPECTION_SCANNER=
+    INTROSPECTION_COMPILER=
+    INTROSPECTION_GENERATE=
+    INTROSPECTION_GIRDIR=
+    INTROSPECTION_TYPELIBDIR=
+    if test "x$found_introspection" = "xyes"; then
+       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner 
gobject-introspection-1.0`
+       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler 
gobject-introspection-1.0`
+       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate 
gobject-introspection-1.0`
+       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir 
gobject-introspection-1.0`
+       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir 
gobject-introspection-1.0)"
+       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir 
gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+    fi
+    AC_SUBST(INTROSPECTION_SCANNER)
+    AC_SUBST(INTROSPECTION_COMPILER)
+    AC_SUBST(INTROSPECTION_GENERATE)
+    AC_SUBST(INTROSPECTION_GIRDIR)
+    AC_SUBST(INTROSPECTION_TYPELIBDIR)
+    AC_SUBST(INTROSPECTION_CFLAGS)
+    AC_SUBST(INTROSPECTION_LIBS)
+    AC_SUBST(INTROSPECTION_MAKEFILE)
+
+    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
+])
+
+
+dnl Usage:
+dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
+
+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
+[
+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
+])
+
+dnl Usage:
+dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
+
+
+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
+[
+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
+])
diff --git a/sysui/desktop/share/create_tree.sh 
b/sysui/desktop/share/create_tree.sh
index c6be0bb..3cda12f 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -87,3 +87,16 @@ for i in base calc draw impress writer; do
     cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" 
"${DESTDIR}/${PREFIXDIR}/share/appdata/${PREFIX}-${i}.appdata.xml"
 done
 
+# Generate gobject-introspection files
+mkdir -p "${DESTDIR}/${PREFIXDIR}/share/gir-1.0"
+g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" 
"${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
+             `${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` 
-I"${SRCDIR}/include/" \
+             --include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \
+             --library=libreofficekitgtk 
--library-path="${INSTALLDIR}/program/libreofficekitgtk" \
+             --include=Gdk-3.0 --include=GdkPixbuf-2.0 --include=Gtk-3.0 \
+             --namespace=LOKDocView --nsversion=0.1 --identifier-prefix=LOKDoc 
--symbol-prefix=lok_doc \
+             
--output="${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" --warn-all 
--no-libtool
+
+mkdir -p "${DESTDIR}/${LIBDIR}/girepository-1.0"
+g-ir-compiler "${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" \
+              
--output="${DESTDIR}/${LIBDIR}/girepository-1.0/LOKDocView-0.1.typelib"
commit 9a8a4442fd6368c20cf6a3d7efa3bd42962ee12f
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Mon Jul 27 08:19:30 2015 +0200

    setup_native: Add vcruntime and libucrt on MSVC 14.0
    
    Change-Id: If55979b55b4bc8dee785f0940461a01995060682
    Reviewed-on: https://gerrit.libreoffice.org/17362
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/setup_native/Library_instooofiltmsi.mk 
b/setup_native/Library_instooofiltmsi.mk
index a4c9fa8..770f80f 100644
--- a/setup_native/Library_instooofiltmsi.mk
+++ b/setup_native/Library_instooofiltmsi.mk
@@ -29,6 +29,8 @@ $(eval $(call 
gb_Library_add_exception_objects,instooofiltmsi,\
 $(eval $(call gb_Library_use_system_win32_libs,instooofiltmsi,\
        libcmt \
        libcpmt \
+       $(if $(filter-out 120,$(VCVER)),libucrt) \
+       $(if $(filter-out 120,$(VCVER)),libvcruntime) \
        kernel32 \
 ))
 
diff --git a/setup_native/Library_qslnkmsi.mk b/setup_native/Library_qslnkmsi.mk
index 2e5e2fe..8aa8868 100644
--- a/setup_native/Library_qslnkmsi.mk
+++ b/setup_native/Library_qslnkmsi.mk
@@ -33,6 +33,8 @@ $(eval $(call gb_Library_use_static_libraries,qslnkmsi,\
 $(eval $(call gb_Library_use_system_win32_libs,qslnkmsi,\
        libcmt \
        libcpmt \
+       $(if $(filter-out 120,$(VCVER)),libucrt) \
+       $(if $(filter-out 120,$(VCVER)),libvcruntime) \
        msi \
        kernel32 \
        user32 \
diff --git a/setup_native/Library_reg4allmsdoc.mk 
b/setup_native/Library_reg4allmsdoc.mk
index 6713176..64aa20f 100644
--- a/setup_native/Library_reg4allmsdoc.mk
+++ b/setup_native/Library_reg4allmsdoc.mk
@@ -31,6 +31,8 @@ $(eval $(call gb_Library_add_exception_objects,reg4allmsdoc,\
 $(eval $(call gb_Library_use_system_win32_libs,reg4allmsdoc,\
        libcmt \
        libcpmt \
+       $(if $(filter-out 120,$(VCVER)),libucrt) \
+       $(if $(filter-out 120,$(VCVER)),libvcruntime) \
        msi \
        kernel32 \
        user32 \
diff --git a/setup_native/Library_regactivex.mk 
b/setup_native/Library_regactivex.mk
index c823d7c..3d0a51e 100644
--- a/setup_native/Library_regactivex.mk
+++ b/setup_native/Library_regactivex.mk
@@ -29,6 +29,8 @@ $(eval $(call gb_Library_add_exception_objects,regactivex,\
 $(eval $(call gb_Library_use_system_win32_libs,regactivex,\
        libcmt \
        libcpmt \
+       $(if $(filter-out 120,$(VCVER)),libucrt) \
+       $(if $(filter-out 120,$(VCVER)),libvcruntime) \
        kernel32 \
        msi \
 ))
diff --git a/setup_native/Library_sdqsmsi.mk b/setup_native/Library_sdqsmsi.mk
index 732159e..2f29e16 100644
--- a/setup_native/Library_sdqsmsi.mk
+++ b/setup_native/Library_sdqsmsi.mk
@@ -33,6 +33,8 @@ $(eval $(call gb_Library_use_static_libraries,sdqsmsi,\
 $(eval $(call gb_Library_use_system_win32_libs,sdqsmsi,\
        libcmt \
        libcpmt \
+       $(if $(filter-out 120,$(VCVER)),libucrt) \
+       $(if $(filter-out 120,$(VCVER)),libvcruntime) \
        msi \
        kernel32 \
        user32 \
diff --git a/setup_native/Library_sellangmsi.mk 
b/setup_native/Library_sellangmsi.mk
index 2df29fc..60d4e95 100644
--- a/setup_native/Library_sellangmsi.mk
+++ b/setup_native/Library_sellangmsi.mk
@@ -34,6 +34,8 @@ $(eval $(call gb_Library_add_exception_objects,sellangmsi,\
 $(eval $(call gb_Library_use_system_win32_libs,sellangmsi,\
        libcmt \
        libcpmt \
+       $(if $(filter-out 120,$(VCVER)),libucrt) \
+       $(if $(filter-out 120,$(VCVER)),libvcruntime) \
        msi \
        kernel32 \
        user32 \
diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk
index ae619e6..161ff8a 100644
--- a/setup_native/Library_shlxtmsi.mk
+++ b/setup_native/Library_shlxtmsi.mk
@@ -41,6 +41,8 @@ $(eval $(call gb_Library_use_static_libraries,shlxtmsi,\
 $(eval $(call gb_Library_use_system_win32_libs,shlxtmsi,\
        libcmt \
        libcpmt \
+       $(if $(filter-out 120,$(VCVER)),libucrt) \
+       $(if $(filter-out 120,$(VCVER)),libvcruntime) \
        msi \
        kernel32 \
        advapi32 \
diff --git a/setup_native/Library_sn_tools.mk b/setup_native/Library_sn_tools.mk
index c857d0d..68aeeed 100644
--- a/setup_native/Library_sn_tools.mk
+++ b/setup_native/Library_sn_tools.mk
@@ -33,6 +33,8 @@ $(eval $(call gb_Library_use_static_libraries,sn_tools,\
 $(eval $(call gb_Library_use_system_win32_libs,sn_tools,\
        libcmt \
        libcpmt \
+       $(if $(filter-out 120,$(VCVER)),libucrt) \
+       $(if $(filter-out 120,$(VCVER)),libvcruntime) \
        kernel32 \
        msi \
        advapi32 \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 6b39a4d..6fdab45 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -195,7 +195,7 @@ $(call gb_Helper_abbreviate_dirs,\
 endef
 
 define gb_MSVCRT_subst
-$(if $(MSVC_USE_DEBUG_RUNTIME),$(subst msvcrt,msvcrtd,$(subst 
msvcprt,msvcprtd,$(subst libcmt,libcmtd,$(subst libcpmt,libcpmtd,$(subst 
msvcmrt,msvcmrtd,$(1)))))),$(1))
+$(if $(MSVC_USE_DEBUG_RUNTIME),$(subst msvcrt,msvcrtd,$(subst 
msvcprt,msvcprtd,$(subst libcmt,libcmtd,$(subst 
libvcruntime,libvcruntimed,$(subst libucrt,libucrtd,$(subst 
libcpmt,libcpmtd,$(subst msvcmrt,msvcmrtd,$(1)))))))),$(1))
 endef
 
 define gb_LinkTarget_use_system_win32_libs
@@ -204,7 +204,7 @@ $(if $(call gb_LinkTarget__is_merged,$(1)),\
        $(call gb_LinkTarget_add_libs,$(call 
gb_Library_get_linktarget,merged),$(foreach lib,$(2),$(call 
gb_MSVCRT_subst,$(lib)).lib)))
 endef
 
-# Flags common for PE executables (EXEs and DLLs) 
+# Flags common for PE executables (EXEs and DLLs)
 gb_Windows_PE_TARGETTYPEFLAGS := \
        -release \
        -opt:noref \
commit fd27553f3848be20e113b99bdb756b7ce00c790f
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Thu Sep 3 21:56:04 2015 +0200

    climaker: Fix std::array and cli::array collision
    
    Change-Id: I7b4815b4b7e8f016ce7a9047c77a6dde46b1ee0a
    Reviewed-on: https://gerrit.libreoffice.org/18320
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: David Ostrovsky <da...@ostrovsky.org>

diff --git a/cli_ure/source/climaker/climaker_app.cxx 
b/cli_ure/source/climaker/climaker_app.cxx
index efff92d..01ab101 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -509,8 +509,8 @@ SAL_IMPLEMENT_MAIN()
 
         if (product.getLength() != 0)
         {
-            array< ::System::Type^>^ params = gcnew array< ::System::Type^> 
(1);
-            array< ::System::Object^>^args = gcnew array< 
::System::Object^>(1);
+            cli::array< ::System::Type^>^ params = gcnew cli::array< 
::System::Type^> (1);
+            cli::array< ::System::Object^>^args = gcnew cli::array< 
::System::Object^>(1);
             params[ 0 ] = ::System::String::typeid;
             args[ 0 ] = ustring_to_String( product );
             assembly_builder->SetCustomAttribute(
@@ -520,8 +520,8 @@ SAL_IMPLEMENT_MAIN()
         }
         if (description.getLength() != 0)
         {
-            array< ::System::Type^>^ params = gcnew array< ::System::Type^>(1);
-            array< ::System::Object^>^ args = gcnew array< 
::System::Object^>(1);
+            cli::array< ::System::Type^>^ params = gcnew cli::array< 
::System::Type^>(1);
+            cli::array< ::System::Object^>^ args = gcnew cli::array< 
::System::Object^>(1);
             params[ 0 ] = ::System::String::typeid;
             args[ 0 ] = ustring_to_String( description );
             assembly_builder->SetCustomAttribute(
@@ -531,8 +531,8 @@ SAL_IMPLEMENT_MAIN()
         }
         if (company.getLength() != 0)
         {
-            array< ::System::Type^>^ params = gcnew array< ::System::Type^>(1);
-            array< ::System::Object^>^ args = gcnew array< 
::System::Object^>(1);
+            cli::array< ::System::Type^>^ params = gcnew cli::array< 
::System::Type^>(1);
+            cli::array< ::System::Object^>^ args = gcnew cli::array< 
::System::Object^>(1);
             params[ 0 ] = ::System::String::typeid;
             args[ 0 ] = ustring_to_String( company );
             assembly_builder->SetCustomAttribute(
@@ -542,8 +542,8 @@ SAL_IMPLEMENT_MAIN()
         }
         if (copyright.getLength() != 0)
         {
-            array< ::System::Type^>^ params = gcnew array< ::System::Type^>(1);
-            array< ::System::Object^>^ args = gcnew array< 
::System::Object^>(1);
+            cli::array< ::System::Type^>^ params = gcnew cli::array< 
::System::Type^>(1);
+            cli::array< ::System::Object^>^ args = gcnew cli::array< 
::System::Object^>(1);
             params[ 0 ] = ::System::String::typeid;
             args[ 0 ] = ustring_to_String( copyright );
             assembly_builder->SetCustomAttribute(
@@ -553,8 +553,8 @@ SAL_IMPLEMENT_MAIN()
         }
         if (trademark.getLength() != 0)
         {
-            array< ::System::Type^>^ params = gcnew array< ::System::Type^>(1);
-            array< ::System::Object^>^ args = gcnew array< 
::System::Object^>(1);
+            cli::array< ::System::Type^>^ params = gcnew cli::array< 
::System::Type^>(1);
+            cli::array< ::System::Object^>^ args = gcnew cli::array< 
::System::Object^>(1);
             params[ 0 ] = ::System::String::typeid;
             args[ 0 ] = ustring_to_String( trademark );
             assembly_builder->SetCustomAttribute(
@@ -564,8 +564,8 @@ SAL_IMPLEMENT_MAIN()
         }
 
         // load extra assemblies
-        array<Assembly^>^ assemblies =
-            gcnew array<Assembly^>(extra_assemblies.size());
+        cli::array<Assembly^>^ assemblies =
+            gcnew cli::array<Assembly^>(extra_assemblies.size());
         for ( size_t pos = 0; pos < extra_assemblies.size(); ++pos )
         {
             assemblies[ pos ] = Assembly::LoadFrom(
commit aafc0d29178ebb88201d4062481d3498e4a9ff18
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Thu Sep 3 21:55:16 2015 +0200

    unoxml: Add missing include
    
    Change-Id: I5497abb747dc12080f076aaf81b946710bcd5570
    Reviewed-on: https://gerrit.libreoffice.org/18319
    Reviewed-by: Michael Stahl <mst...@redhat.com>
    Tested-by: Michael Stahl <mst...@redhat.com>

diff --git a/unoxml/source/rdf/librdf_repository.cxx 
b/unoxml/source/rdf/librdf_repository.cxx
index aefdc8d..1dc5eaf 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -23,6 +23,7 @@
 
 #include <set>
 #include <map>
+#include <iterator>
 #include <functional>
 #include <algorithm>
 
commit 8a4848b373afee618769051d6c70fb4c9efdaeed
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Sun Jul 5 10:58:55 2015 +0200

    Fix liblangtag on MSVC 14.0
    
    Change-Id: Ied20186f4863b49dba5d0c7ed98b3a297f3f2239
    Reviewed-on: https://gerrit.libreoffice.org/16767
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/external/liblangtag/UnpackedTarball_langtag.mk 
b/external/liblangtag/UnpackedTarball_langtag.mk
index 541baa3..52ffc39 100644
--- a/external/liblangtag/UnpackedTarball_langtag.mk
+++ b/external/liblangtag/UnpackedTarball_langtag.mk
@@ -15,10 +15,9 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,langtag,\
        $(GNUTAR) -x -j -f 
$(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL) \
 ))
 
-# Currently no patches applied, if there were it would be:
-#$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
-#      external/liblangtag/your-modification.patch \
-#))
+$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
+       external/liblangtag/liblangtag-msvc.patch \
+))
 
 ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
diff --git a/external/liblangtag/liblangtag-msvc.patch 
b/external/liblangtag/liblangtag-msvc.patch
new file mode 100644
index 0000000..535797b
--- /dev/null
+++ b/external/liblangtag/liblangtag-msvc.patch
@@ -0,0 +1,36 @@
+--- foo/langtag.orig/configure 2015-06-26 10:53:36.000000000 +0200
++++ foo/langtag/configure      2015-09-03 08:16:58.672240500 +0200
+@@ -14786,8 +14786,7 @@
+   fi
+ 
+ 
+-if test "x$ac_cv_func_vsnprintf" = xyes; then
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether vsnprintf is 
C99-compliant" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether vsnprintf is 
C99-compliant" >&5
+ $as_echo_n "checking Whether vsnprintf is C99-compliant... " >&6; }
+ if ${lt_cv_c99_vsnprintf+:} false; then :
+   $as_echo_n "(cached) " >&6
+@@ -14798,7 +14797,10 @@
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <sys/types.h>
++#include <stdio.h>
+ #include <stdarg.h>
++#include <stdlib.h>
+ int
+ foo(char *format, ...)
+ {
+@@ -14834,11 +14836,10 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_c99_vsnprintf" >&5
+ $as_echo "$lt_cv_c99_vsnprintf" >&6; }
+-      if test "x$lt_cv_c99_vsnprintf" = xyes; then
++if test "x$lt_cv_c99_vsnprintf" = xyes; then
+ 
+ $as_echo "#define LT_HAVE_C99_VSNPRINTF 1" >>confdefs.h
+ 
+-      fi
+ fi
+ 
+ 
commit 7a30553b22441647f286619fc77d85a624ac3005
Author: Michael Stahl <mst...@redhat.com>
Date:   Thu Sep 3 20:40:30 2015 +0200

    sal: actually that uwinapi stuff doesn't include sal headers?
    
    Change-Id: I1812b7050af725ee754c9e41b9b635319eead33a

diff --git a/sal/systools/win32/uwinapi/legacy.c 
b/sal/systools/win32/uwinapi/legacy.c
index 9ba73b2..c2ca560 100644
--- a/sal/systools/win32/uwinapi/legacy.c
+++ b/sal/systools/win32/uwinapi/legacy.c
@@ -16,7 +16,7 @@
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1900)
 // older versions use uwinapi.def file for export
-SAL_DLLPUBLIC_EXPORT
+__declspec(dllexport)
 #endif
 DWORD WINAPI GetShortPathNameW(LPCWSTR lpszLongPath,LPWSTR lpszShortPath,DWORD 
cchBuffer)
 {
commit cfaebe5de91c8049b086019e4c0ef90d5cbb883f
Author: Takeshi Abe <t...@fixedpoint.jp>
Date:   Thu Sep 3 09:33:40 2015 +0900

    shell: tdf#88206 replace cppu::WeakImplHelper* etc.
    
    with the variadic variants.
    
    Change-Id: I0eb2efbd123198c7d8a99e9dd7c613f9b2b23c2d
    Reviewed-on: https://gerrit.libreoffice.org/18286
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx 
b/shell/source/backends/desktopbe/desktopbackend.cxx
index 57851af..d0d1391 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -39,7 +39,7 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XCurrentContext.hpp"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase2.hxx"
+#include <cppuhelper/implbase.hxx>
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/weak.hxx"
 #include "osl/diagnose.h"
@@ -64,7 +64,7 @@ css::uno::Sequence< OUString > SAL_CALL 
getDefaultSupportedServiceNames() {
 }
 
 class Default:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::beans::XPropertySet >,
     private boost::noncopyable
 {
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx 
b/shell/source/backends/gconfbe/gconfbackend.cxx
index 71fbdd6..1143f31 100644
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -40,7 +40,7 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XCurrentContext.hpp"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase2.hxx"
+#include <cppuhelper/implbase.hxx>
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/weak.hxx"
 #include "rtl/string.h"
@@ -65,7 +65,7 @@ css::uno::Sequence< OUString > SAL_CALL 
getServiceSupportedServiceNames() {
 }
 
 class Service:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::beans::XPropertySet >,
     private boost::noncopyable
 {
diff --git a/shell/source/backends/kde4be/kde4backend.cxx 
b/shell/source/backends/kde4be/kde4backend.cxx
index 05931bd..25af4d5 100644
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -40,7 +40,7 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XCurrentContext.hpp"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase2.hxx"
+#include <cppuhelper/implbase.hxx>
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/weak.hxx"
 #include "rtl/string.h"
@@ -65,7 +65,7 @@ css::uno::Sequence< OUString > SAL_CALL 
getServiceSupportedServiceNames() {
 }
 
 class Service:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::beans::XPropertySet >,
     private boost::noncopyable
 {
diff --git a/shell/source/backends/kdebe/kdebackend.cxx 
b/shell/source/backends/kdebe/kdebackend.cxx
index 77a561d..dd0dd2b 100644
--- a/shell/source/backends/kdebe/kdebackend.cxx
+++ b/shell/source/backends/kdebe/kdebackend.cxx
@@ -38,7 +38,7 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XCurrentContext.hpp"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase2.hxx"
+#include <cppuhelper/implbase.hxx>
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/weak.hxx"
 #include "rtl/string.h"
@@ -65,7 +65,7 @@ css::uno::Sequence< OUString > SAL_CALL 
getServiceSupportedServiceNames() {
 }
 
 class Service:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::beans::XPropertySet >,
     private boost::noncopyable
 {
diff --git a/shell/source/backends/localebe/localebackend.hxx 
b/shell/source/backends/localebe/localebackend.hxx
index cd58221..b90305c 100644
--- a/shell/source/backends/localebe/localebackend.hxx
+++ b/shell/source/backends/localebe/localebackend.hxx
@@ -22,14 +22,14 @@
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/string.hxx>
 
 
 namespace uno = css::uno ;
 namespace lang = css::lang ;
 
-class LocaleBackend : public ::cppu::WeakImplHelper2 <
+class LocaleBackend : public ::cppu::WeakImplHelper <
         css::beans::XPropertySet,
         lang::XServiceInfo > {
 
diff --git a/shell/source/backends/macbe/macbackend.hxx 
b/shell/source/backends/macbe/macbackend.hxx
index 1486d1d..6de7fd9 100644
--- a/shell/source/backends/macbe/macbackend.hxx
+++ b/shell/source/backends/macbe/macbackend.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/string.hxx>
 
 // FIXME: stdio.h only for debugging...
@@ -31,7 +31,7 @@
 namespace uno = css::uno;
 namespace lang = css::lang;
 
-class MacOSXBackend : public ::cppu::WeakImplHelper2 
<css::beans::XPropertySet, lang::XServiceInfo >
+class MacOSXBackend : public ::cppu::WeakImplHelper <css::beans::XPropertySet, 
lang::XServiceInfo >
 {
 
 public:
diff --git a/shell/source/backends/wininetbe/wininetbackend.hxx 
b/shell/source/backends/wininetbe/wininetbackend.hxx
index 1b90140..d6913a4 100644
--- a/shell/source/backends/wininetbe/wininetbackend.hxx
+++ b/shell/source/backends/wininetbe/wininetbackend.hxx
@@ -23,13 +23,13 @@
 #include <com/sun/star/beans/Optional.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/string.hxx>
 
 namespace uno = css::uno ;
 namespace lang = css::lang ;
 
-class WinInetBackend : public ::cppu::WeakImplHelper2 <
+class WinInetBackend : public ::cppu::WeakImplHelper <
         css::beans::XPropertySet,
         lang::XServiceInfo > {
 
diff --git a/shell/source/cmdmail/cmdmailmsg.hxx 
b/shell/source/cmdmail/cmdmailmsg.hxx
index b45226f..f07b70b 100644
--- a/shell/source/cmdmail/cmdmailmsg.hxx
+++ b/shell/source/cmdmail/cmdmailmsg.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILMSG_HXX
 #define INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILMSG_HXX
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 
@@ -33,7 +33,7 @@
 
 
 class CmdMailMsg :
-    public  cppu::WeakImplHelper2<
+    public  cppu::WeakImplHelper<
         ::com::sun::star::system::XSimpleMailMessage2,
         ::com::sun::star::container::XNameAccess >
 {
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx 
b/shell/source/cmdmail/cmdmailsuppl.cxx
index 07da391..d426cbd 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -74,7 +74,7 @@ namespace // private
 
 
 CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) :
-    WeakImplHelper3< XSimpleMailClientSupplier, XSimpleMailClient, 
XServiceInfo >()
+    WeakImplHelper< XSimpleMailClientSupplier, XSimpleMailClient, XServiceInfo 
>()
 {
     m_xConfigurationProvider = theDefaultProvider::get(xContext);
 }
diff --git a/shell/source/cmdmail/cmdmailsuppl.hxx 
b/shell/source/cmdmail/cmdmailsuppl.hxx
index 02dc7f8..c9ed773 100644
--- a/shell/source/cmdmail/cmdmailsuppl.hxx
+++ b/shell/source/cmdmail/cmdmailsuppl.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILSUPPL_HXX
 #define INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILSUPPL_HXX
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -35,7 +35,7 @@
 
 
 class CmdMailSuppl :
-    public  cppu::WeakImplHelper3<
+    public  cppu::WeakImplHelper<
         com::sun::star::system::XSimpleMailClientSupplier,
         com::sun::star::system::XSimpleMailClient,
         com::sun::star::lang::XServiceInfo >
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx 
b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
index 47c72a8..04d9776 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
@@ -13,11 +13,11 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace shell { namespace sessioninstall
 {
-    class SyncDbusSessionHelper : public ::cppu::WeakImplHelper1< 
::org::freedesktop::PackageKit::XSyncDbusSessionHelper >
+    class SyncDbusSessionHelper : public ::cppu::WeakImplHelper< 
::org::freedesktop::PackageKit::XSyncDbusSessionHelper >
     {
         public:
             SyncDbusSessionHelper(::com::sun::star::uno::Reference< 
::com::sun::star::uno::XComponentContext> const&);
diff --git a/shell/source/unix/exec/shellexec.cxx 
b/shell/source/unix/exec/shellexec.cxx
index 0239a66..b7657cb 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -82,7 +82,7 @@ void escapeForShell( OStringBuffer & rBuffer, const OString & 
rURL)
 
 
 ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) :
-    WeakImplHelper2< XSystemShellExecute, XServiceInfo >(),
+    WeakImplHelper< XSystemShellExecute, XServiceInfo >(),
     m_xContext(xContext)
 {
     try {
diff --git a/shell/source/unix/exec/shellexec.hxx 
b/shell/source/unix/exec/shellexec.hxx
index 92d6894..90c5b04 100644
--- a/shell/source/unix/exec/shellexec.hxx
+++ b/shell/source/unix/exec/shellexec.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SHELL_SOURCE_UNIX_EXEC_SHELLEXEC_HXX
 #define INCLUDED_SHELL_SOURCE_UNIX_EXEC_SHELLEXEC_HXX
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/strbuf.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -32,7 +32,7 @@
 // class declaration
 
 
-class ShellExec : public ::cppu::WeakImplHelper2< 
com::sun::star::system::XSystemShellExecute, com::sun::star::lang::XServiceInfo 
>
+class ShellExec : public ::cppu::WeakImplHelper< 
com::sun::star::system::XSystemShellExecute, com::sun::star::lang::XServiceInfo 
>
 {
     OString m_aDesktopEnvironment;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext 
>
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 18e78fc..a0aef84 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -245,7 +245,7 @@ namespace // private
 
 
 CSysShExec::CSysShExec( const Reference< css::uno::XComponentContext >& 
xContext ) :
-    WeakComponentImplHelper2< XSystemShellExecute, XServiceInfo >( m_aMutex ),
+    WeakComponentImplHelper< XSystemShellExecute, XServiceInfo >( m_aMutex ),
     m_xContext(xContext)
 {
     /*
diff --git a/shell/source/win32/SysShExec.hxx b/shell/source/win32/SysShExec.hxx
index e17b788..b3b6ad9 100644
--- a/shell/source/win32/SysShExec.hxx
+++ b/shell/source/win32/SysShExec.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SHELL_SOURCE_WIN32_SYSSHEXEC_HXX
 #define INCLUDED_SHELL_SOURCE_WIN32_SYSSHEXEC_HXX
 
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <osl/mutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -39,7 +39,7 @@ protected:
 
 class CSysShExec :
     public CSysShExecBase,
-    public  cppu::WeakComponentImplHelper2<
+    public  cppu::WeakComponentImplHelper<
             com::sun::star::system::XSystemShellExecute,
             com::sun::star::lang::XServiceInfo >
 {
diff --git a/shell/source/win32/simplemail/smplmailclient.hxx 
b/shell/source/win32/simplemail/smplmailclient.hxx
index ee9a167..5d85596 100644
--- a/shell/source/win32/simplemail/smplmailclient.hxx
+++ b/shell/source/win32/simplemail/smplmailclient.hxx
@@ -20,12 +20,13 @@
 #ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILCLIENT_HXX
 #define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILCLIENT_HXX
 
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <com/sun/star/system/XSimpleMailClient.hpp>
+#include <vector>
 
-class CSmplMailClient : public 
cppu::WeakImplHelper1<css::system::XSimpleMailClient>
+class CSmplMailClient : public 
cppu::WeakImplHelper<css::system::XSimpleMailClient>
 {
 public:
     virtual css::uno::Reference<css::system::XSimpleMailMessage> SAL_CALL 
createSimpleMailMessage()
diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx 
b/shell/source/win32/simplemail/smplmailmsg.hxx
index 9cf2c38..0762bd8 100644
--- a/shell/source/win32/simplemail/smplmailmsg.hxx
+++ b/shell/source/win32/simplemail/smplmailmsg.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILMSG_HXX
 #define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILMSG_HXX
 
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/system/XSimpleMailMessage2.hpp>
@@ -30,7 +30,7 @@
 
 
 class CSmplMailMsg :
-    public  cppu::WeakImplHelper1< com::sun::star::system::XSimpleMailMessage2 
>
+    public  cppu::WeakImplHelper< com::sun::star::system::XSimpleMailMessage2 >
 {
 public:
     CSmplMailMsg( );
diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx 
b/shell/source/win32/simplemail/smplmailsuppl.cxx
index d92de18..d363712 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.cxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.cxx
@@ -46,7 +46,7 @@ namespace // private
 } // end private namespace
 
 CSmplMailSuppl::CSmplMailSuppl() :
-    WeakComponentImplHelper2<XSimpleMailClientSupplier, XServiceInfo>(m_aMutex)
+    WeakComponentImplHelper<XSimpleMailClientSupplier, XServiceInfo>(m_aMutex)
 {
 }
 
diff --git a/shell/source/win32/simplemail/smplmailsuppl.hxx 
b/shell/source/win32/simplemail/smplmailsuppl.hxx
index 45a2d48..c5e1f68 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.hxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILSUPPL_HXX
 #define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILSUPPL_HXX
 
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <osl/mutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/system/XSimpleMailClientSupplier.hpp>
@@ -36,7 +36,7 @@ protected:
 
 class CSmplMailSuppl :
     public CSmplMailSupplBase,
-    public  cppu::WeakComponentImplHelper2<
+    public  cppu::WeakComponentImplHelper<
             com::sun::star::system::XSimpleMailClientSupplier,
             com::sun::star::lang::XServiceInfo >
 {
commit f3c7e6953675f4ed85a5212a6af3ee189400f34e
Author: Takeshi Abe <t...@fixedpoint.jp>
Date:   Sat Aug 29 07:48:41 2015 +0900

    scripting: tdf#88206 replace cppu::WeakImplHelper* etc.
    
    with the variadic variants.
    
    Change-Id: I2a59d42efbb1aeef5078d0b0744b5a3c0559affa
    Reviewed-on: https://gerrit.libreoffice.org/18123
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/scripting/source/basprov/baslibnode.hxx 
b/scripting/source/basprov/baslibnode.hxx
index 5b13c27..43fa4ca 100644
--- a/scripting/source/basprov/baslibnode.hxx
+++ b/scripting/source/basprov/baslibnode.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/script/browse/XBrowseNode.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 class BasicManager;
 
@@ -38,7 +38,7 @@ namespace basprov
     //  class BasicLibraryNodeImpl
 
 
-    typedef ::cppu::WeakImplHelper1<
+    typedef ::cppu::WeakImplHelper<
         ::com::sun::star::script::browse::XBrowseNode > 
BasicLibraryNodeImpl_BASE;
 
 
diff --git a/scripting/source/basprov/basmethnode.hxx 
b/scripting/source/basprov/basmethnode.hxx
index ae45a30..24631eb 100644
--- a/scripting/source/basprov/basmethnode.hxx
+++ b/scripting/source/basprov/basmethnode.hxx
@@ -28,7 +28,7 @@
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/propertycontainer.hxx>
 #include <comphelper/uno3.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 class SbMethod;
@@ -43,7 +43,7 @@ namespace basprov
     //  class BasicMethodNodeImpl
 
 
-    typedef ::cppu::WeakImplHelper2<
+    typedef ::cppu::WeakImplHelper<
         ::com::sun::star::script::browse::XBrowseNode,
         ::com::sun::star::script::XInvocation > BasicMethodNodeImpl_BASE;
 
diff --git a/scripting/source/basprov/basmodnode.hxx 
b/scripting/source/basprov/basmodnode.hxx
index 6cc8bd5..7efbb69 100644
--- a/scripting/source/basprov/basmodnode.hxx
+++ b/scripting/source/basprov/basmodnode.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/script/browse/XBrowseNode.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 class SbModule;
 
@@ -37,7 +37,7 @@ namespace basprov
     //  class BasicModuleNodeImpl
 
 
-    typedef ::cppu::WeakImplHelper1<
+    typedef ::cppu::WeakImplHelper<
         ::com::sun::star::script::browse::XBrowseNode > 
BasicModuleNodeImpl_BASE;
 
 
diff --git a/scripting/source/basprov/basprov.hxx 
b/scripting/source/basprov/basprov.hxx
index b798d55..b552d4e 100644
--- a/scripting/source/basprov/basprov.hxx
+++ b/scripting/source/basprov/basprov.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/script/provider/XScriptProvider.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 
 class BasicManager;
 
@@ -42,7 +42,7 @@ namespace basprov
     //  class BasicProviderImpl
 
 
-    typedef ::cppu::WeakImplHelper4<
+    typedef ::cppu::WeakImplHelper<
         ::com::sun::star::lang::XServiceInfo,
         ::com::sun::star::lang::XInitialization,
         ::com::sun::star::script::provider::XScriptProvider,
diff --git a/scripting/source/basprov/basscript.hxx 
b/scripting/source/basprov/basscript.hxx
index 203a3f6..0cf87fb 100644
--- a/scripting/source/basprov/basscript.hxx
+++ b/scripting/source/basprov/basscript.hxx
@@ -23,7 +23,7 @@
 #include "bcholder.hxx"
 #include <com/sun/star/script/provider/XScript.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/propertycontainer.hxx>
 #include <basic/sbmeth.hxx>
@@ -40,7 +40,7 @@ namespace basprov
     //  class BasicScriptImpl
 
 
-    typedef ::cppu::WeakImplHelper1<
+    typedef ::cppu::WeakImplHelper<
         ::com::sun::star::script::provider::XScript > BasicScriptImpl_BASE;
 
 
diff --git a/scripting/source/dlgprov/DialogModelProvider.hxx 
b/scripting/source/dlgprov/DialogModelProvider.hxx
index ef1f468..c225cd8 100644
--- a/scripting/source/dlgprov/DialogModelProvider.hxx
+++ b/scripting/source/dlgprov/DialogModelProvider.hxx
@@ -22,7 +22,7 @@
 
 #include "sal/config.h"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase4.hxx"
+#include <cppuhelper/implbase.hxx>
 #include "com/sun/star/lang/XInitialization.hpp"
 #include "com/sun/star/container/XNameContainer.hpp"
 #include "com/sun/star/lang/XServiceInfo.hpp"
@@ -32,7 +32,7 @@
 namespace dlgprov{
 
 class DialogModelProvider:
-    public ::cppu::WeakImplHelper4<
+    public ::cppu::WeakImplHelper<
         css::lang::XInitialization,
         css::container::XNameContainer,
         css::beans::XPropertySet,
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx 
b/scripting/source/dlgprov/dlgevtatt.hxx
index 3f12f25..b0441c7 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/beans/XIntrospectionAccess.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/script/XScriptEventsSupplier.hpp>
 
@@ -42,7 +42,7 @@ namespace dlgprov
         OUStringHash,
         std::equal_to< OUString > > ListenerHash;
 
-    typedef ::cppu::WeakImplHelper1<
+    typedef ::cppu::WeakImplHelper<
         ::com::sun::star::script::XScriptEventsAttacher > 
DialogEventsAttacherImpl_BASE;
 
 
@@ -84,7 +84,7 @@ namespace dlgprov
     // class DialogAllListenerImpl
 
 
-    typedef ::cppu::WeakImplHelper1<
+    typedef ::cppu::WeakImplHelper<
         ::com::sun::star::script::XAllListener > DialogAllListenerImpl_BASE;
 
 
@@ -118,7 +118,7 @@ namespace dlgprov
     // class DialogScriptListenerImpl
 
 
-    typedef ::cppu::WeakImplHelper1<
+    typedef ::cppu::WeakImplHelper<
         ::com::sun::star::script::XScriptListener > 
DialogScriptListenerImpl_BASE;
 
 
diff --git a/scripting/source/dlgprov/dlgprov.hxx 
b/scripting/source/dlgprov/dlgprov.hxx
index 1a183b3..5544443 100644
--- a/scripting/source/dlgprov/dlgprov.hxx
+++ b/scripting/source/dlgprov/dlgprov.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/script/XScriptEventsAttacher.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 #include <memory>
 
@@ -63,7 +63,7 @@ namespace dlgprov
                 const ::com::sun::star::uno::Reference< 
::com::sun::star::resource::XStringResourceManager >& xStringResourceManager,
                 const ::com::sun::star::uno::Any &aDialogSourceURL) throw ( 
::com::sun::star::uno::Exception );
 
-    typedef ::cppu::WeakImplHelper4<
+    typedef ::cppu::WeakImplHelper<
         ::com::sun::star::lang::XServiceInfo,
         ::com::sun::star::lang::XInitialization,
         ::com::sun::star::awt::XDialogProvider2,
diff --git a/scripting/source/protocolhandler/scripthandler.hxx 
b/scripting/source/protocolhandler/scripthandler.hxx
index 309a8a6..11231c3 100644
--- a/scripting/source/protocolhandler/scripthandler.hxx
+++ b/scripting/source/protocolhandler/scripthandler.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/frame/XNotifyingDispatch.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/script/provider/XScriptProvider.hpp>
 
 
@@ -61,7 +61,7 @@ namespace scripting_protocolhandler
 {
 
 class ScriptProtocolHandler :
-public ::cppu::WeakImplHelper4< css::frame::XDispatchProvider,
+public ::cppu::WeakImplHelper< css::frame::XDispatchProvider,
     css::frame::XNotifyingDispatch, css::lang::XServiceInfo, 
css::lang::XInitialization >
 {
 private:
diff --git a/scripting/source/provider/ActiveMSPList.cxx 
b/scripting/source/provider/ActiveMSPList.cxx
index 281b1e6..2b1595e 100644
--- a/scripting/source/provider/ActiveMSPList.cxx
+++ b/scripting/source/provider/ActiveMSPList.cxx
@@ -19,7 +19,6 @@
 
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <util/MiscUtils.hxx>
 
diff --git a/scripting/source/provider/ActiveMSPList.hxx 
b/scripting/source/provider/ActiveMSPList.hxx
index 93e4bc8..e19f890 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -21,7 +21,7 @@
 
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
@@ -51,7 +51,7 @@ typedef std::unordered_map< OUString,
 
 class NonDocMSPCreator;
 
-class ActiveMSPList : public ::cppu::WeakImplHelper1< 
css::lang::XEventListener  >
+class ActiveMSPList : public ::cppu::WeakImplHelper< css::lang::XEventListener 
 >
 {
 
 public:
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx 
b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index e173f45..1dfe7d3 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -22,7 +22,7 @@
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <unotools/mediadescriptor.hxx>
 
@@ -51,7 +51,7 @@ using namespace ::sf_misc;
 namespace browsenodefactory
 {
 class BrowseNodeAggregator :
-    public ::cppu::WeakImplHelper1< browse::XBrowseNode >
+    public ::cppu::WeakImplHelper< browse::XBrowseNode >
 {
 private:
     OUString m_Name;
@@ -172,7 +172,7 @@ struct alphaSort
     }
 };
 class LocationBrowseNode :
-    public ::cppu::WeakImplHelper1< browse::XBrowseNode >
+    public ::cppu::WeakImplHelper< browse::XBrowseNode >
 {
 private:
     BrowseNodeAggregatorHash* m_hBNA;
@@ -370,7 +370,7 @@ struct alphaSortForBNodes
     }
 };
 
-typedef ::cppu::WeakImplHelper1< browse::XBrowseNode > t_BrowseNodeBase;
+typedef ::cppu::WeakImplHelper< browse::XBrowseNode > t_BrowseNodeBase;
 class DefaultBrowseNode :
     public t_BrowseNodeBase
 {
@@ -529,7 +529,7 @@ public:
 };
 
 class DefaultRootBrowseNode :
-    public ::cppu::WeakImplHelper1< browse::XBrowseNode >
+    public ::cppu::WeakImplHelper< browse::XBrowseNode >
 {
 
 private:
@@ -596,7 +596,7 @@ public:
 
 
 class SelectorBrowseNode :
-    public ::cppu::WeakImplHelper1< browse::XBrowseNode >
+    public ::cppu::WeakImplHelper< browse::XBrowseNode >
 {
 private:
     Reference< XComponentContext > m_xComponentContext;
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx 
b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
index 35dd242..74cb302 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SCRIPTING_SOURCE_PROVIDER_BROWSENODEFACTORYIMPL_HXX
 
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -36,7 +36,7 @@ namespace browsenodefactory
 {
 
 class BrowseNodeFactoryImpl :
-    public ::cppu::WeakImplHelper2 <
+    public ::cppu::WeakImplHelper <
         css::script::browse::XBrowseNodeFactory,
         css::lang::XServiceInfo >
 {
diff --git a/scripting/source/provider/MasterScriptProvider.hxx 
b/scripting/source/provider/MasterScriptProvider.hxx
index 47fa679..ef69111 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -22,7 +22,7 @@
 
 #include <rtl/ustring.hxx>
 
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
@@ -39,7 +39,7 @@
 namespace func_provider
 {
 
- typedef ::cppu::WeakImplHelper5<
+ typedef ::cppu::WeakImplHelper<
      css::script::provider::XScriptProvider,
      css::script::browse::XBrowseNode, css::lang::XServiceInfo,
      css::lang::XInitialization,
diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx 
b/scripting/source/provider/MasterScriptProviderFactory.cxx
index 4a67670..d2d4493 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.cxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/factory.hxx>
diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx 
b/scripting/source/provider/MasterScriptProviderFactory.hxx
index a732a84..ff3ac81 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.hxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.hxx
@@ -22,7 +22,7 @@
 
 #include "rtl/ustring.hxx"
 #include "rtl/ref.hxx"
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -38,7 +38,7 @@ namespace func_provider
 {
 
 class MasterScriptProviderFactory :
-    public ::cppu::WeakImplHelper2 <
+    public ::cppu::WeakImplHelper <
         css::script::provider::XScriptProviderFactory,
         css::lang::XServiceInfo >
 {
diff --git a/scripting/source/provider/ProviderCache.hxx 
b/scripting/source/provider/ProviderCache.hxx
index b365887..3a07daa 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -22,7 +22,6 @@
 
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/scripting/source/provider/ScriptImpl.hxx 
b/scripting/source/provider/ScriptImpl.hxx
index 3a53d62..7f3a508 100644
--- a/scripting/source/provider/ScriptImpl.hxx
+++ b/scripting/source/provider/ScriptImpl.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SCRIPTING_SOURCE_PROVIDER_SCRIPTIMPL_HXX
 #define INCLUDED_SCRIPTING_SOURCE_PROVIDER_SCRIPTIMPL_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -36,7 +36,7 @@ namespace func_provider
 {
 
 class ScriptImpl :
-            public ::cppu::WeakImplHelper1 < 
::drafts::com::sun::star::script::framework::provider::XScript >
+            public ::cppu::WeakImplHelper < 
::drafts::com::sun::star::script::framework::provider::XScript >
 {
 
 public:
diff --git a/scripting/source/provider/URIHelper.hxx 
b/scripting/source/provider/URIHelper.hxx
index e4162e8..47a629e 100644
--- a/scripting/source/provider/URIHelper.hxx
+++ b/scripting/source/provider/URIHelper.hxx
@@ -29,13 +29,13 @@
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace func_provider
 {
 
 class ScriptingFrameworkURIHelper :
-    public ::cppu::WeakImplHelper3<
+    public ::cppu::WeakImplHelper<
         css::script::provider::XScriptURIHelper,
         css::lang::XServiceInfo,
         css::lang::XInitialization >
diff --git a/scripting/source/stringresource/stringresource.hxx 
b/scripting/source/stringresource/stringresource.hxx
index 5992ea8..50edd33 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -28,8 +28,7 @@
 #include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <osl/mutex.hxx>
 
@@ -91,7 +90,7 @@ typedef std::vector< LocaleItem* > LocaleItemVector;
 typedef std::vector< LocaleItem* >::iterator LocaleItemVectorIt;
 typedef std::vector< LocaleItem* >::const_iterator LocaleItemVectorConstIt;
 
-typedef ::cppu::WeakImplHelper2<
+typedef ::cppu::WeakImplHelper<
     ::com::sun::star::lang::XServiceInfo,
     ::com::sun::star::resource::XStringResourceManager > 
StringResourceImpl_BASE;
 
@@ -233,7 +232,7 @@ public:
                ::com::sun::star::uno::RuntimeException, std::exception) 
SAL_OVERRIDE;
  };
 
-typedef ::cppu::ImplInheritanceHelper1<
+typedef ::cppu::ImplInheritanceHelper<
         StringResourceImpl,
         ::com::sun::star::resource::XStringResourcePersistence > 
StringResourcePersistenceImpl_BASE;
 
@@ -408,7 +407,7 @@ public:
 };
 
 
-typedef ::cppu::ImplInheritanceHelper2<
+typedef ::cppu::ImplInheritanceHelper<
         StringResourcePersistenceImpl,
         ::com::sun::star::lang::XInitialization,
         ::com::sun::star::resource::XStringResourceWithStorage > 
StringResourceWithStorageImpl_BASE;
@@ -530,7 +529,7 @@ public:
 };
 
 
-typedef ::cppu::ImplInheritanceHelper2<
+typedef ::cppu::ImplInheritanceHelper<
         StringResourcePersistenceImpl,
         ::com::sun::star::lang::XInitialization,
         ::com::sun::star::resource::XStringResourceWithLocation > 
StringResourceWithLocationImpl_BASE;
commit 6e88d63829ad46c1cbb5c0c5b40c578430713817
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date:   Thu Sep 3 19:39:48 2015 +0200

    update emoji autocorrect entries from po-files
    
    Change-Id: I92b5d2f0c66541735a1c186d3c35c9a8390c91ca

diff --git a/extras/source/autocorr/lang/bg/DocumentList.xml 
b/extras/source/autocorr/lang/bg/DocumentList.xml
index 07c02e6..4f23539 100644
--- a/extras/source/autocorr/lang/bg/DocumentList.xml
+++ b/extras/source/autocorr/lang/bg/DocumentList.xml
@@ -16,60 +16,59 @@
   <block-list:block block-list:abbreviated-name="1/2" block-list:name="½"/>
   <block-list:block block-list:abbreviated-name="1/4" block-list:name="¼"/>
   <block-list:block block-list:abbreviated-name="3/4" block-list:name="¾"/>
-  <block-list:block block-list:abbreviated-name=":целувка3:" 
block-list:name="😙"/>
   <block-list:block block-list:abbreviated-name=":_0:" block-list:name="₀"/>
   <block-list:block block-list:abbreviated-name=":^0:" block-list:name="⁰"/>
   <block-list:block block-list:abbreviated-name=":100:" 
block-list:name="💯"/>
-  <block-list:block block-list:abbreviated-name=":10:30:" 
block-list:name="🕥"/>
+  <block-list:block block-list:abbreviated-name=":10.30:" 
block-list:name="🕥"/>
   <block-list:block block-list:abbreviated-name=":10:" block-list:name="🕙"/>
-  <block-list:block block-list:abbreviated-name=":11:30:" 
block-list:name="🕦"/>
+  <block-list:block block-list:abbreviated-name=":11.30:" 
block-list:name="🕦"/>
   <block-list:block block-list:abbreviated-name=":11:" block-list:name="🕚"/>
-  <block-list:block block-list:abbreviated-name=":12:30:" 
block-list:name="🕧"/>
+  <block-list:block block-list:abbreviated-name=":12.30:" 
block-list:name="🕧"/>
   <block-list:block block-list:abbreviated-name=":12:" block-list:name="🕛"/>
   <block-list:block block-list:abbreviated-name=":1/2:" block-list:name="½"/>
-  <block-list:block block-list:abbreviated-name=":1:30:" 
block-list:name="🕜"/>
+  <block-list:block block-list:abbreviated-name=":1.30:" 
block-list:name="🕜"/>
   <block-list:block block-list:abbreviated-name=":1/3:" block-list:name="⅓"/>
   <block-list:block block-list:abbreviated-name=":1/4:" block-list:name="¼"/>
   <block-list:block block-list:abbreviated-name=":1/8:" block-list:name="⅛"/>
   <block-list:block block-list:abbreviated-name=":_1:" block-list:name="₁"/>
   <block-list:block block-list:abbreviated-name=":1:" block-list:name="🕐"/>
   <block-list:block block-list:abbreviated-name=":^1:" block-list:name="¹"/>
-  <block-list:block block-list:abbreviated-name=":2:30:" 
block-list:name="🕝"/>
+  <block-list:block block-list:abbreviated-name=":2.30:" 
block-list:name="🕝"/>
   <block-list:block block-list:abbreviated-name=":2/3:" block-list:name="⅔"/>
   <block-list:block block-list:abbreviated-name=":_2:" block-list:name="₂"/>
   <block-list:block block-list:abbreviated-name=":!2:" block-list:name="❗"/>
   <block-list:block block-list:abbreviated-name=":?2:" block-list:name="❔"/>
   <block-list:block block-list:abbreviated-name=":2:" block-list:name="🕑"/>
   <block-list:block block-list:abbreviated-name=":^2:" block-list:name="²"/>
-  <block-list:block block-list:abbreviated-name=":3:30:" 
block-list:name="🕞"/>
+  <block-list:block block-list:abbreviated-name=":3.30:" 
block-list:name="🕞"/>
   <block-list:block block-list:abbreviated-name=":3/4:" block-list:name="¾"/>
   <block-list:block block-list:abbreviated-name=":3/8:" block-list:name="⅜"/>
   <block-list:block block-list:abbreviated-name=":_3:" block-list:name="₃"/>
   <block-list:block block-list:abbreviated-name=":3:" block-list:name="🕒"/>
   <block-list:block block-list:abbreviated-name=":^3:" block-list:name="³"/>
-  <block-list:block block-list:abbreviated-name=":4:30:" 
block-list:name="🕟"/>
+  <block-list:block block-list:abbreviated-name=":4.30:" 
block-list:name="🕟"/>
   <block-list:block block-list:abbreviated-name=":_4:" block-list:name="₄"/>
   <block-list:block block-list:abbreviated-name=":4:" block-list:name="🕓"/>
   <block-list:block block-list:abbreviated-name=":^4:" block-list:name="⁴"/>
-  <block-list:block block-list:abbreviated-name=":5:30:" block-list:name="🕠
"/>
+  <block-list:block block-list:abbreviated-name=":5.30:" block-list:name="🕠
"/>
   <block-list:block block-list:abbreviated-name=":5/8:" block-list:name="⅝"/>
   <block-list:block block-list:abbreviated-name=":_5:" block-list:name="₅"/>
   <block-list:block block-list:abbreviated-name=":5:" block-list:name="🕔"/>
   <block-list:block block-list:abbreviated-name=":^5:" block-list:name="⁵"/>
-  <block-list:block block-list:abbreviated-name=":6:30:" 
block-list:name="🕡"/>
+  <block-list:block block-list:abbreviated-name=":6.30:" 
block-list:name="🕡"/>
   <block-list:block block-list:abbreviated-name=":_6:" block-list:name="₆"/>
   <block-list:block block-list:abbreviated-name=":6:" block-list:name="🕕"/>
   <block-list:block block-list:abbreviated-name=":^6:" block-list:name="⁶"/>
-  <block-list:block block-list:abbreviated-name=":7:30:" 
block-list:name="🕢"/>
+  <block-list:block block-list:abbreviated-name=":7.30:" 
block-list:name="🕢"/>
   <block-list:block block-list:abbreviated-name=":7/8:" block-list:name="⅞"/>
   <block-list:block block-list:abbreviated-name=":_7:" block-list:name="₇"/>
   <block-list:block block-list:abbreviated-name=":7:" block-list:name="🕖"/>
   <block-list:block block-list:abbreviated-name=":^7:" block-list:name="⁷"/>
-  <block-list:block block-list:abbreviated-name=":8:30:" 
block-list:name="🕣"/>
+  <block-list:block block-list:abbreviated-name=":8.30:" 
block-list:name="🕣"/>
   <block-list:block block-list:abbreviated-name=":_8:" block-list:name="₈"/>
   <block-list:block block-list:abbreviated-name=":8:" block-list:name="🕗"/>
   <block-list:block block-list:abbreviated-name=":^8:" block-list:name="⁸"/>
-  <block-list:block block-list:abbreviated-name=":9:30:" 
block-list:name="🕤"/>
+  <block-list:block block-list:abbreviated-name=":9.30:" 
block-list:name="🕤"/>
   <block-list:block block-list:abbreviated-name=":_9:" block-list:name="₉"/>
   <block-list:block block-list:abbreviated-name=":9:" block-list:name="🕘"/>
   <block-list:block block-list:abbreviated-name=":^9:" block-list:name="⁹"/>
@@ -1114,8 +1113,9 @@
   <block-list:block block-list:abbreviated-name=":целуване:" 
block-list:name="😗"/>
   <block-list:block block-list:abbreviated-name=":целуваща 
котка:" block-list:name="😽"/>
   <block-list:block block-list:abbreviated-name=":целувка2:" 
block-list:name="😘"/>
-  <block-list:block block-list:abbreviated-name=":целувка3:" 
block-list:name="💋"/>
+  <block-list:block block-list:abbreviated-name=":целувка3:" 
block-list:name="😙"/>
   <block-list:block block-list:abbreviated-name=":целувка4:" 
block-list:name="😚"/>
+  <block-list:block block-list:abbreviated-name=":целувка5:" 
block-list:name="💋"/>
   <block-list:block block-list:abbreviated-name=":целувка:" 
block-list:name="💏"/>
   <block-list:block block-list:abbreviated-name=":цент:" 
block-list:name="¢"/>
   <block-list:block block-list:abbreviated-name=":цигулка:" 
block-list:name="🎻"/>
diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml 
b/extras/source/autocorr/lang/ca/DocumentList.xml
index a1be79e..cba1a8e 100644
--- a/extras/source/autocorr/lang/ca/DocumentList.xml
+++ b/extras/source/autocorr/lang/ca/DocumentList.xml
@@ -353,58 +353,63 @@
   <block-list:block block-list:abbreviated-name="donat que" 
block-list:name="atès que"/>
   <block-list:block block-list:abbreviated-name="tals com" 
block-list:name="com ara"/>
   <block-list:block block-list:abbreviated-name=":clau:" 
block-list:name="🔑"/>
+  <block-list:block block-list:abbreviated-name=":bandera:" 
block-list:name="⚐"/>
+  <block-list:block block-list:abbreviated-name=":bloqueig:" 
block-list:name="🔒"/>
+  <block-list:block block-list:abbreviated-name=":coche:" 
block-list:name="🚗"/>
+  <block-list:block block-list:abbreviated-name=":llibre:" 
block-list:name="📕"/>
+  <block-list:block block-list:abbreviated-name=":marcador2:" 
block-list:name="🔖"/>
   <block-list:block block-list:abbreviated-name=":_0:" block-list:name="₀"/>
   <block-list:block block-list:abbreviated-name=":^0:" block-list:name="⁰"/>
-  <block-list:block block-list:abbreviated-name=":10:30:" 
block-list:name="🕥"/>
+  <block-list:block block-list:abbreviated-name=":10.30:" 
block-list:name="🕥"/>
   <block-list:block block-list:abbreviated-name=":10:" block-list:name="🕙"/>
-  <block-list:block block-list:abbreviated-name=":11:30:" 
block-list:name="🕦"/>
+  <block-list:block block-list:abbreviated-name=":11.30:" 
block-list:name="🕦"/>
   <block-list:block block-list:abbreviated-name=":11:" block-list:name="🕚"/>
-  <block-list:block block-list:abbreviated-name=":12:30:" 
block-list:name="🕧"/>
+  <block-list:block block-list:abbreviated-name=":12.30:" 
block-list:name="🕧"/>
   <block-list:block block-list:abbreviated-name=":12:" block-list:name="🕛"/>
   <block-list:block block-list:abbreviated-name=":1/2:" block-list:name="½"/>
-  <block-list:block block-list:abbreviated-name=":1:30:" 
block-list:name="🕜"/>
+  <block-list:block block-list:abbreviated-name=":1.30:" 
block-list:name="🕜"/>
   <block-list:block block-list:abbreviated-name=":1/3:" block-list:name="⅓"/>
   <block-list:block block-list:abbreviated-name=":1/4:" block-list:name="¼"/>
   <block-list:block block-list:abbreviated-name=":1/8:" block-list:name="⅛"/>
   <block-list:block block-list:abbreviated-name=":_1:" block-list:name="₁"/>
   <block-list:block block-list:abbreviated-name=":1:" block-list:name="🕐"/>
   <block-list:block block-list:abbreviated-name=":^1:" block-list:name="¹"/>
-  <block-list:block block-list:abbreviated-name=":2:30:" 
block-list:name="🕝"/>
+  <block-list:block block-list:abbreviated-name=":2.30:" 
block-list:name="🕝"/>
   <block-list:block block-list:abbreviated-name=":2/3:" block-list:name="⅔"/>
   <block-list:block block-list:abbreviated-name=":_2:" block-list:name="₂"/>
   <block-list:block block-list:abbreviated-name=":!2:" block-list:name="❗"/>
   <block-list:block block-list:abbreviated-name=":?2:" block-list:name="❔"/>
   <block-list:block block-list:abbreviated-name=":2:" block-list:name="🕑"/>
   <block-list:block block-list:abbreviated-name=":^2:" block-list:name="²"/>
-  <block-list:block block-list:abbreviated-name=":3:30:" 
block-list:name="🕞"/>
+  <block-list:block block-list:abbreviated-name=":3.30:" 
block-list:name="🕞"/>
   <block-list:block block-list:abbreviated-name=":3/4:" block-list:name="¾"/>
   <block-list:block block-list:abbreviated-name=":3/8:" block-list:name="⅜"/>
   <block-list:block block-list:abbreviated-name=":_3:" block-list:name="₃"/>
   <block-list:block block-list:abbreviated-name=":3:" block-list:name="🕒"/>
   <block-list:block block-list:abbreviated-name=":^3:" block-list:name="³"/>
-  <block-list:block block-list:abbreviated-name=":4:30:" 
block-list:name="🕟"/>
+  <block-list:block block-list:abbreviated-name=":4.30:" 
block-list:name="🕟"/>
   <block-list:block block-list:abbreviated-name=":_4:" block-list:name="₄"/>
   <block-list:block block-list:abbreviated-name=":4:" block-list:name="🕓"/>
   <block-list:block block-list:abbreviated-name=":^4:" block-list:name="⁴"/>
-  <block-list:block block-list:abbreviated-name=":5:30:" block-list:name="🕠
"/>
+  <block-list:block block-list:abbreviated-name=":5.30:" block-list:name="🕠
"/>
   <block-list:block block-list:abbreviated-name=":5/8:" block-list:name="⅝"/>
   <block-list:block block-list:abbreviated-name=":_5:" block-list:name="₅"/>
   <block-list:block block-list:abbreviated-name=":5:" block-list:name="🕔"/>
   <block-list:block block-list:abbreviated-name=":^5:" block-list:name="⁵"/>
-  <block-list:block block-list:abbreviated-name=":6:30:" 
block-list:name="🕡"/>
+  <block-list:block block-list:abbreviated-name=":6.30:" 
block-list:name="🕡"/>
   <block-list:block block-list:abbreviated-name=":_6:" block-list:name="₆"/>
   <block-list:block block-list:abbreviated-name=":6:" block-list:name="🕕"/>
   <block-list:block block-list:abbreviated-name=":^6:" block-list:name="⁶"/>
-  <block-list:block block-list:abbreviated-name=":7:30:" 
block-list:name="🕢"/>
+  <block-list:block block-list:abbreviated-name=":7.30:" 
block-list:name="🕢"/>
   <block-list:block block-list:abbreviated-name=":7/8:" block-list:name="⅞"/>
   <block-list:block block-list:abbreviated-name=":_7:" block-list:name="₇"/>
   <block-list:block block-list:abbreviated-name=":7:" block-list:name="🕖"/>
   <block-list:block block-list:abbreviated-name=":^7:" block-list:name="⁷"/>
-  <block-list:block block-list:abbreviated-name=":8:30:" 
block-list:name="🕣"/>
+  <block-list:block block-list:abbreviated-name=":8.30:" 
block-list:name="🕣"/>
   <block-list:block block-list:abbreviated-name=":_8:" block-list:name="₈"/>
   <block-list:block block-list:abbreviated-name=":8:" block-list:name="🕗"/>
   <block-list:block block-list:abbreviated-name=":^8:" block-list:name="⁸"/>
-  <block-list:block block-list:abbreviated-name=":9:30:" 
block-list:name="🕤"/>
+  <block-list:block block-list:abbreviated-name=":9.30:" 
block-list:name="🕤"/>
   <block-list:block block-list:abbreviated-name=":_9:" block-list:name="₉"/>
   <block-list:block block-list:abbreviated-name=":9:" block-list:name="🕘"/>
   <block-list:block block-list:abbreviated-name=":^9:" block-list:name="⁹"/>
@@ -464,7 +469,7 @@
   <block-list:block block-list:abbreviated-name=":banc:" 
block-list:name="🏦"/>
   <block-list:block block-list:abbreviated-name=":bandera2:" 
block-list:name="⚑"/>
   <block-list:block block-list:abbreviated-name=":bandera3:" 
block-list:name="🏁"/>
-  <block-list:block block-list:abbreviated-name=":bandera:" 
block-list:name="⚐"/>
+  <block-list:block block-list:abbreviated-name=":bandera:" 
block-list:name="♭"/>
   <block-list:block block-list:abbreviated-name=":banderes2:" 
block-list:name="🎏"/>
   <block-list:block block-list:abbreviated-name=":banderes:" 
block-list:name="🎌"/>
   <block-list:block block-list:abbreviated-name=":bany:" 
block-list:name="🛀"/>
@@ -514,11 +519,12 @@
   <block-list:block block-list:abbreviated-name=":\\:" block-list:name="∖"/>
   <block-list:block block-list:abbreviated-name=":+-:" block-list:name="±"/>
   <block-list:block block-list:abbreviated-name=":…:" block-list:name="…"/>
-  <block-list:block block-list:abbreviated-name=":bloqueig:" 
block-list:name="🔒"/>
+  <block-list:block block-list:abbreviated-name=":bloqueig:" 
block-list:name="🔏"/>
   <block-list:block block-list:abbreviated-name=":boca:" 
block-list:name="👄"/>
   <block-list:block block-list:abbreviated-name=":boira:" 
block-list:name="🌁"/>
   <block-list:block block-list:abbreviated-name=":bola:" 
block-list:name="⛹"/>
   <block-list:block block-list:abbreviated-name=":bola d'arròs:" 
block-list:name="🍙"/>
+  <block-list:block block-list:abbreviated-name=":bola de confeti:" 
block-list:name="🎊"/>
   <block-list:block block-list:abbreviated-name=":bola de cristall:" 
block-list:name="🔮"/>
   <block-list:block block-list:abbreviated-name=":bolet:" 
block-list:name="🍄"/>
   <block-list:block block-list:abbreviated-name=":bomba:" 
block-list:name="💣"/>
@@ -591,7 +597,7 @@
   <block-list:block block-list:abbreviated-name=":coala:" 
block-list:name="🐨"/>
   <block-list:block block-list:abbreviated-name=":coche2:" 
block-list:name="🚘"/>
   <block-list:block block-list:abbreviated-name=":coche3:" 
block-list:name="🚙"/>
-  <block-list:block block-list:abbreviated-name=":coche:" 
block-list:name="🚗"/>
+  <block-list:block block-list:abbreviated-name=":coche:" 
block-list:name="📈"/>
   <block-list:block block-list:abbreviated-name=":cocodril:" 
block-list:name="🐊"/>
   <block-list:block block-list:abbreviated-name=":còctel:" 
block-list:name="🍸"/>
   <block-list:block block-list:abbreviated-name=":cometa:" 
block-list:name="☄"/>
@@ -624,6 +630,7 @@
   <block-list:block block-list:abbreviated-name=":creu ortodoxa:" 
block-list:name="☦"/>
   <block-list:block block-list:abbreviated-name=":crismó:" 
block-list:name="☧"/>
   <block-list:block block-list:abbreviated-name=":cronòmetre:" 
block-list:name="⏱"/>
+  <block-list:block block-list:abbreviated-name=":cuixa de pollastre:" 
block-list:name="🍗"/>
   <block-list:block block-list:abbreviated-name=":curri:" 
block-list:name="🍛"/>
   <block-list:block block-list:abbreviated-name=":cursa de cavalls:" 
block-list:name="🏇"/>
   <block-list:block block-list:abbreviated-name=":d'acord:" 
block-list:name="👌"/>
@@ -742,6 +749,7 @@
   <block-list:block block-list:abbreviated-name=":fulla:" 
block-list:name="🍁"/>
   <block-list:block block-list:abbreviated-name=":futbol:" 
block-list:name="⚽"/>
   <block-list:block block-list:abbreviated-name=":galeta:" 
block-list:name="🍪"/>
+  <block-list:block block-list:abbreviated-name=":galeta d'arròs:" 
block-list:name="🍘"/>
   <block-list:block block-list:abbreviated-name=":gall:" 
block-list:name="🐓"/>
   <block-list:block block-list:abbreviated-name=":gallina:" 
block-list:name="🐔"/>
   <block-list:block block-list:abbreviated-name=":^gamma:" 
block-list:name="ᵞ"/>
@@ -766,6 +774,7 @@
   <block-list:block block-list:abbreviated-name=":&gt;=:" 
block-list:name="≥"/>
   <block-list:block block-list:abbreviated-name=":&gt;&gt;:" 
block-list:name="≫"/>
   <block-list:block block-list:abbreviated-name=":guitarra:" 
block-list:name="🎸"/>
+  <block-list:block block-list:abbreviated-name=":Halloween:" 
block-list:name="🎃"/>
   <block-list:block block-list:abbreviated-name=":hamburguesa:" 
block-list:name="🍔"/>
   <block-list:block block-list:abbreviated-name=":hàmster:" 
block-list:name="🐹"/>
   <block-list:block block-list:abbreviated-name=":^h:" block-list:name="Ê°"/>
@@ -824,6 +833,8 @@
   <block-list:block block-list:abbreviated-name=":^L:" block-list:name="á´¸"/>
   <block-list:block block-list:abbreviated-name=":lira:" 
block-list:name="₤"/>
   <block-list:block block-list:abbreviated-name=":lira turca:" 
block-list:name="₺"/>
+  <block-list:block block-list:abbreviated-name=":llaç:" 
block-list:name="🎀"/>
+  <block-list:block block-list:abbreviated-name=":llaminadura:" 
block-list:name="🍬"/>
   <block-list:block block-list:abbreviated-name=":llampec:" 
block-list:name="☇"/>
   <block-list:block block-list:abbreviated-name=":llapis2:" 
block-list:name="✏"/>
   <block-list:block block-list:abbreviated-name=":llapis3:" 
block-list:name="✐"/>
@@ -835,7 +846,7 @@
   <block-list:block block-list:abbreviated-name=":Lleó:" 
block-list:name="♌"/>
   <block-list:block block-list:abbreviated-name=":lleopard:" 
block-list:name="🐆"/>
   <block-list:block block-list:abbreviated-name=":llibre2:" 
block-list:name="📖"/>
-  <block-list:block block-list:abbreviated-name=":llibre:" 
block-list:name="📕"/>
+  <block-list:block block-list:abbreviated-name=":llibre:" 
block-list:name="👢"/>
   <block-list:block block-list:abbreviated-name=":llibres:" 
block-list:name="📚"/>
   <block-list:block block-list:abbreviated-name=":lliga_ffi:" 
block-list:name="ffi"/>
   <block-list:block block-list:abbreviated-name=":lliga_fi:" 
block-list:name="fi"/>
@@ -847,6 +858,7 @@
   <block-list:block block-list:abbreviated-name=":Lluna2:" 
block-list:name="☾"/>
   <block-list:block block-list:abbreviated-name=":lluna:" 
block-list:name="🌛"/>
   <block-list:block block-list:abbreviated-name=":Lluna:" 
block-list:name="☽"/>
+  <block-list:block block-list:abbreviated-name=":lluna creixent:" 
block-list:name="🌙"/>
   <block-list:block block-list:abbreviated-name=":lluna nova2:" 
block-list:name="🌚"/>
   <block-list:block block-list:abbreviated-name=":lluna nova:" 
block-list:name="🌑"/>
   <block-list:block block-list:abbreviated-name=":lluna plena2:" 
block-list:name="🌝"/>
@@ -864,7 +876,7 @@
   <block-list:block block-list:abbreviated-name=":marca de verificació2:" 
block-list:name="✔"/>
   <block-list:block block-list:abbreviated-name=":marca de verificació3:" 
block-list:name="✅"/>
   <block-list:block block-list:abbreviated-name=":marca de verificació:" 
block-list:name="✓"/>
-  <block-list:block block-list:abbreviated-name=":marcador2:" 
block-list:name="🔖"/>
+  <block-list:block block-list:abbreviated-name=":marcador2:" 
block-list:name="📑"/>
   <block-list:block block-list:abbreviated-name=":marca registrada:" 
block-list:name="™"/>
   <block-list:block block-list:abbreviated-name=":marieta:" 
block-list:name="🐞"/>
   <block-list:block block-list:abbreviated-name=":martell:" 
block-list:name="🔨"/>
@@ -957,6 +969,7 @@
   <block-list:block block-list:abbreviated-name=":palmera:" 
block-list:name="🌴"/>
   <block-list:block block-list:abbreviated-name=":panda:" 
block-list:name="🐼"/>
   <block-list:block block-list:abbreviated-name=":panís:" 
block-list:name="🌽"/>
+  <block-list:block block-list:abbreviated-name=":paper reciclat:" 
block-list:name="♼"/>
   <block-list:block block-list:abbreviated-name=":paquet:" 
block-list:name="📦"/>
   <block-list:block block-list:abbreviated-name=":parada de bus:" 
block-list:name="🚏"/>
   <block-list:block block-list:abbreviated-name=":paraigua2:" 
block-list:name="🌂"/>
@@ -970,6 +983,7 @@
   <block-list:block block-list:abbreviated-name=":parella3:" 
block-list:name="👭"/>
   <block-list:block block-list:abbreviated-name=":parella4:" 
block-list:name="💑"/>
   <block-list:block block-list:abbreviated-name=":parella:" 
block-list:name="👫"/>
+  <block-list:block block-list:abbreviated-name=":Pare Nadal:" 
block-list:name="🎅"/>
   <block-list:block block-list:abbreviated-name=":partitura:" 
block-list:name="🎼"/>
   <block-list:block block-list:abbreviated-name=":pastís:" 
block-list:name="🍰"/>
   <block-list:block block-list:abbreviated-name=":patates fregides:" 
block-list:name="🍟"/>
@@ -1218,6 +1232,7 @@
   <block-list:block block-list:abbreviated-name=":xéquel:" 
block-list:name="₪"/>
   <block-list:block block-list:abbreviated-name=":xeringa:" 
block-list:name="💉"/>
   <block-list:block block-list:abbreviated-name=":xocolata:" 
block-list:name="🍫"/>
+  <block-list:block block-list:abbreviated-name=":xupa-xups:" 
block-list:name="🍭"/>
   <block-list:block block-list:abbreviated-name=":^y:" block-list:name="ʸ"/>
   <block-list:block block-list:abbreviated-name=":ying-yang:" 
block-list:name="☯"/>
   <block-list:block block-list:abbreviated-name=":^z:" block-list:name="ᶻ"/>
diff --git a/extras/source/autocorr/lang/cs/DocumentList.xml 
b/extras/source/autocorr/lang/cs/DocumentList.xml
index 9253aca..f7b217e 100644
--- a/extras/source/autocorr/lang/cs/DocumentList.xml
+++ b/extras/source/autocorr/lang/cs/DocumentList.xml
@@ -572,56 +572,56 @@
   <block-list:block block-list:abbreviated-name=":_0:" block-list:name="₀"/>
   <block-list:block block-list:abbreviated-name=":^0:" block-list:name="⁰"/>
   <block-list:block block-list:abbreviated-name=":100:" 
block-list:name="💯"/>
-  <block-list:block block-list:abbreviated-name=":10:30:" 
block-list:name="🕥"/>
+  <block-list:block block-list:abbreviated-name=":10.30:" 
block-list:name="🕥"/>
   <block-list:block block-list:abbreviated-name=":10:" block-list:name="🕙"/>
-  <block-list:block block-list:abbreviated-name=":11:30:" 
block-list:name="🕦"/>
+  <block-list:block block-list:abbreviated-name=":11.30:" 
block-list:name="🕦"/>
   <block-list:block block-list:abbreviated-name=":11:" block-list:name="🕚"/>
-  <block-list:block block-list:abbreviated-name=":12:30:" 
block-list:name="🕧"/>
+  <block-list:block block-list:abbreviated-name=":12.30:" 
block-list:name="🕧"/>
   <block-list:block block-list:abbreviated-name=":12:" block-list:name="🕛"/>
   <block-list:block block-list:abbreviated-name=":1/2:" block-list:name="½"/>
-  <block-list:block block-list:abbreviated-name=":1:30:" 
block-list:name="🕜"/>
+  <block-list:block block-list:abbreviated-name=":1.30:" 
block-list:name="🕜"/>
   <block-list:block block-list:abbreviated-name=":1/3:" block-list:name="⅓"/>
   <block-list:block block-list:abbreviated-name=":1/4:" block-list:name="¼"/>
   <block-list:block block-list:abbreviated-name=":1/8:" block-list:name="⅛"/>
   <block-list:block block-list:abbreviated-name=":_1:" block-list:name="₁"/>
   <block-list:block block-list:abbreviated-name=":1:" block-list:name="🕐"/>
   <block-list:block block-list:abbreviated-name=":^1:" block-list:name="¹"/>
-  <block-list:block block-list:abbreviated-name=":2:30:" 
block-list:name="🕝"/>
+  <block-list:block block-list:abbreviated-name=":2.30:" 
block-list:name="🕝"/>
   <block-list:block block-list:abbreviated-name=":2/3:" block-list:name="⅔"/>
   <block-list:block block-list:abbreviated-name=":_2:" block-list:name="₂"/>
   <block-list:block block-list:abbreviated-name=":!2:" block-list:name="❗"/>
   <block-list:block block-list:abbreviated-name=":?2:" block-list:name="❔"/>
   <block-list:block block-list:abbreviated-name=":2:" block-list:name="🕑"/>
   <block-list:block block-list:abbreviated-name=":^2:" block-list:name="²"/>
-  <block-list:block block-list:abbreviated-name=":3:30:" 
block-list:name="🕞"/>
+  <block-list:block block-list:abbreviated-name=":3.30:" 
block-list:name="🕞"/>
   <block-list:block block-list:abbreviated-name=":3/4:" block-list:name="¾"/>
   <block-list:block block-list:abbreviated-name=":3/8:" block-list:name="⅜"/>
   <block-list:block block-list:abbreviated-name=":_3:" block-list:name="₃"/>
   <block-list:block block-list:abbreviated-name=":3:" block-list:name="🕒"/>
   <block-list:block block-list:abbreviated-name=":^3:" block-list:name="³"/>
-  <block-list:block block-list:abbreviated-name=":4:30:" 
block-list:name="🕟"/>
+  <block-list:block block-list:abbreviated-name=":4.30:" 
block-list:name="🕟"/>
   <block-list:block block-list:abbreviated-name=":_4:" block-list:name="₄"/>
   <block-list:block block-list:abbreviated-name=":4:" block-list:name="🕓"/>
   <block-list:block block-list:abbreviated-name=":^4:" block-list:name="⁴"/>
-  <block-list:block block-list:abbreviated-name=":5:30:" block-list:name="🕠
"/>
+  <block-list:block block-list:abbreviated-name=":5.30:" block-list:name="🕠
"/>
   <block-list:block block-list:abbreviated-name=":5/8:" block-list:name="⅝"/>
   <block-list:block block-list:abbreviated-name=":_5:" block-list:name="₅"/>
   <block-list:block block-list:abbreviated-name=":5:" block-list:name="🕔"/>
   <block-list:block block-list:abbreviated-name=":^5:" block-list:name="⁵"/>
-  <block-list:block block-list:abbreviated-name=":6:30:" 
block-list:name="🕡"/>
+  <block-list:block block-list:abbreviated-name=":6.30:" 
block-list:name="🕡"/>
   <block-list:block block-list:abbreviated-name=":_6:" block-list:name="₆"/>
   <block-list:block block-list:abbreviated-name=":6:" block-list:name="🕕"/>
   <block-list:block block-list:abbreviated-name=":^6:" block-list:name="⁶"/>
-  <block-list:block block-list:abbreviated-name=":7:30:" 
block-list:name="🕢"/>
+  <block-list:block block-list:abbreviated-name=":7.30:" 
block-list:name="🕢"/>
   <block-list:block block-list:abbreviated-name=":7/8:" block-list:name="⅞"/>
   <block-list:block block-list:abbreviated-name=":_7:" block-list:name="₇"/>
   <block-list:block block-list:abbreviated-name=":7:" block-list:name="🕖"/>
   <block-list:block block-list:abbreviated-name=":^7:" block-list:name="⁷"/>
-  <block-list:block block-list:abbreviated-name=":8:30:" 
block-list:name="🕣"/>
+  <block-list:block block-list:abbreviated-name=":8.30:" 
block-list:name="🕣"/>
   <block-list:block block-list:abbreviated-name=":_8:" block-list:name="₈"/>
   <block-list:block block-list:abbreviated-name=":8:" block-list:name="🕗"/>
   <block-list:block block-list:abbreviated-name=":^8:" block-list:name="⁸"/>
-  <block-list:block block-list:abbreviated-name=":9:30:" 
block-list:name="🕤"/>
+  <block-list:block block-list:abbreviated-name=":9.30:" 
block-list:name="🕤"/>
   <block-list:block block-list:abbreviated-name=":_9:" block-list:name="₉"/>
   <block-list:block block-list:abbreviated-name=":9:" block-list:name="🕘"/>
   <block-list:block block-list:abbreviated-name=":^9:" block-list:name="⁹"/>
diff --git a/extras/source/autocorr/lang/da/DocumentList.xml 
b/extras/source/autocorr/lang/da/DocumentList.xml
index 266b526..00c1eea 100644
--- a/extras/source/autocorr/lang/da/DocumentList.xml
+++ b/extras/source/autocorr/lang/da/DocumentList.xml
@@ -621,7 +621,6 @@
   <block-list:block block-list:abbreviated-name="1/2" block-list:name="½"/>
   <block-list:block block-list:abbreviated-name="1/4" block-list:name="¼"/>
   <block-list:block block-list:abbreviated-name="3/4" block-list:name="¾"/>
-  <block-list:block block-list:abbreviated-name=":rynker panden:" 
block-list:name="🙍"/>
   <block-list:block block-list:abbreviated-name=":_0:" block-list:name="₀"/>
   <block-list:block block-list:abbreviated-name=":^0:" block-list:name="⁰"/>
   <block-list:block block-list:abbreviated-name=":100:" 
block-list:name="💯"/>
@@ -683,6 +682,8 @@
   <block-list:block block-list:abbreviated-name=":abe:" 
block-list:name="🐒"/>
   <block-list:block block-list:abbreviated-name=":Ã¥ben mund:" 
block-list:name="😮"/>
   <block-list:block block-list:abbreviated-name=":^a:" block-list:name="ᵃ"/>
+  <block-list:block block-list:abbreviated-name=":_a:" block-list:name="ₐ"/>
+  <block-list:block block-list:abbreviated-name=":^A:" block-list:name="á´¬"/>
   <block-list:block block-list:abbreviated-name=":åbne hænder:" 
block-list:name="👐"/>
   <block-list:block block-list:abbreviated-name=":Adi Shakti:" 
block-list:name="☬"/>
   <block-list:block block-list:abbreviated-name=":advarsel:" 
block-list:name="⚠"/>
@@ -694,7 +695,6 @@
   <block-list:block block-list:abbreviated-name=":ældre mand:" 
block-list:name="👴"/>
   <block-list:block block-list:abbreviated-name=":affald:" 
block-list:name="🚮"/>
   <block-list:block block-list:abbreviated-name=":affald forbudt:" 
block-list:name="🚯"/>
-  <block-list:block block-list:abbreviated-name=":affjedret jernbane:" 
block-list:name="🚟"/>
   <block-list:block block-list:abbreviated-name=":afkrydsning2:" 
block-list:name="✔"/>
   <block-list:block block-list:abbreviated-name=":Afkrydsning3:" 
block-list:name="✅"/>
   <block-list:block block-list:abbreviated-name=":afkrydsning:" 
block-list:name="✓"/>
@@ -703,6 +703,7 @@
   <block-list:block block-list:abbreviated-name=":afkrydsningsboks:" 
block-list:name="☐"/>
   <block-list:block block-list:abbreviated-name=":aftagende fuldmåne:" 
block-list:name="🌖"/>
   <block-list:block block-list:abbreviated-name=":aftagende halvmåne:" 
block-list:name="🌘"/>
+  <block-list:block block-list:abbreviated-name=":^alfa:" block-list:name="ᵅ
"/>
   <block-list:block block-list:abbreviated-name=":alfa:" block-list:name="α"/>
   <block-list:block block-list:abbreviated-name=":Alfa:" block-list:name="Α"/>
   <block-list:block block-list:abbreviated-name=":ambulance:" 
block-list:name="🚑"/>
@@ -732,11 +733,15 @@
   <block-list:block block-list:abbreviated-name=":basketball:" 
block-list:name="🏀"/>
   <block-list:block block-list:abbreviated-name=":batteri:" 
block-list:name="🔋"/>
   <block-list:block block-list:abbreviated-name=":^b:" block-list:name="ᵇ"/>
+  <block-list:block block-list:abbreviated-name=":^B:" block-list:name="á´®"/>
   <block-list:block block-list:abbreviated-name=":bede:" 
block-list:name="🙏"/>
   <block-list:block block-list:abbreviated-name=":begynder:" 
block-list:name="🔰"/>
   <block-list:block block-list:abbreviated-name=":bekymret:" 
block-list:name="😟"/>
   <block-list:block block-list:abbreviated-name=":bento:" 
block-list:name="🍱"/>
   <block-list:block block-list:abbreviated-name=":benzinpumpe:" 
block-list:name="⛽"/>
+  <block-list:block block-list:abbreviated-name=":beskæmmet:" 
block-list:name="😖"/>
+  <block-list:block block-list:abbreviated-name=":^beta:" 
block-list:name="ᵝ"/>
+  <block-list:block block-list:abbreviated-name=":_beta:" 
block-list:name="ᵦ"/>
   <block-list:block block-list:abbreviated-name=":beta:" block-list:name="β"/>
   <block-list:block block-list:abbreviated-name=":Beta:" block-list:name="Β"/>
   <block-list:block block-list:abbreviated-name=":bevis slut:" 
block-list:name="∎"/>
@@ -816,13 +821,16 @@
   <block-list:block block-list:abbreviated-name=":butik2:" 
block-list:name="🏬"/>
   <block-list:block block-list:abbreviated-name=":butik:" 
block-list:name="🏪"/>
   <block-list:block block-list:abbreviated-name=":^c:" block-list:name="ᶜ"/>
+  <block-list:block block-list:abbreviated-name=":^C:" block-list:name="á´°"/>
   <block-list:block block-list:abbreviated-name=":cd:" block-list:name="💿"/>
   <block-list:block block-list:abbreviated-name=":cent:" block-list:name="¢"/>
   <block-list:block block-list:abbreviated-name=":champignon:" 
block-list:name="🍄"/>
+  <block-list:block block-list:abbreviated-name=":^chi:" 
block-list:name="ᵡ"/>
+  <block-list:block block-list:abbreviated-name=":_chi:" 
block-list:name="ᵪ"/>
   <block-list:block block-list:abbreviated-name=":chi:" block-list:name="χ"/>
   <block-list:block block-list:abbreviated-name=":Chi:" block-list:name="Χ"/>
   <block-list:block block-list:abbreviated-name=":chi rho:" 
block-list:name="☧"/>
-  <block-list:block block-list:abbreviated-name=":chocolade:" 
block-list:name="🍫"/>
+  <block-list:block block-list:abbreviated-name=":chokolade:" 
block-list:name="🍫"/>
   <block-list:block block-list:abbreviated-name=":cirkel2:" 
block-list:name="●"/>
   <block-list:block block-list:abbreviated-name=":cirkel:" 
block-list:name="○"/>
   <block-list:block block-list:abbreviated-name=":cirkustelt:" 
block-list:name="🎪"/>
@@ -843,6 +851,7 @@
   <block-list:block block-list:abbreviated-name=":^d:" block-list:name="ᵈ"/>
   <block-list:block block-list:abbreviated-name=":delfin:" 
block-list:name="🐬"/>
   <block-list:block block-list:abbreviated-name=":delmængde:" 
block-list:name="⊂"/>
+  <block-list:block block-list:abbreviated-name=":^delta:" 
block-list:name="ᵟ"/>
   <block-list:block block-list:abbreviated-name=":delta:" 
block-list:name="δ"/>
   <block-list:block block-list:abbreviated-name=":Delta:" 
block-list:name="Δ"/>
   <block-list:block block-list:abbreviated-name=":diagram2:" 
block-list:name="📉"/>
@@ -871,7 +880,10 @@
   <block-list:block block-list:abbreviated-name=":dybstegte rejser:" 
block-list:name="🍤"/>
   <block-list:block block-list:abbreviated-name=":E2:" block-list:name="⇒"/>
   <block-list:block block-list:abbreviated-name=":^e:" block-list:name="ᵉ"/>
+  <block-list:block block-list:abbreviated-name=":_e:" block-list:name="ₑ"/>
+  <block-list:block block-list:abbreviated-name=":^E:" block-list:name="á´±"/>
   <block-list:block block-list:abbreviated-name=":E:" block-list:name="→"/>
+  <block-list:block block-list:abbreviated-name=":efterladt bagage:" 
block-list:name="🛅"/>
   <block-list:block block-list:abbreviated-name=":eftertænksom:" 
block-list:name="😔"/>
   <block-list:block block-list:abbreviated-name=":eksisterer:" 
block-list:name="∃"/>
   <block-list:block block-list:abbreviated-name=":eksisterer ikke:" 
block-list:name="∄"/>
@@ -881,6 +893,7 @@
   <block-list:block block-list:abbreviated-name=":elpære:" 
block-list:name="💡"/>
   <block-list:block block-list:abbreviated-name=":e-mail:" 
block-list:name="📧"/>
   <block-list:block block-list:abbreviated-name=":engel:" 
block-list:name="👼"/>
+  <block-list:block block-list:abbreviated-name=":^epsilon:" 
block-list:name="ᵋ"/>
   <block-list:block block-list:abbreviated-name=":epsilon:" 
block-list:name="ε"/>
   <block-list:block block-list:abbreviated-name=":Epsilon:" 
block-list:name="Ε"/>
   <block-list:block block-list:abbreviated-name=":es:" block-list:name="🂡"/>
@@ -911,6 +924,7 @@
   <block-list:block block-list:abbreviated-name=":fisk3:" 
block-list:name="🐡"/>
   <block-list:block block-list:abbreviated-name=":fisk:" 
block-list:name="🐟"/>
   <block-list:block block-list:abbreviated-name=":fiske:" 
block-list:name="🎣"/>
+  <block-list:block block-list:abbreviated-name=":fiskeflag:" 
block-list:name="🎏"/>
   <block-list:block block-list:abbreviated-name=":fiskefrikadelle:" 
block-list:name="🍥"/>
   <block-list:block block-list:abbreviated-name=":Fiskene:" 
block-list:name="♓"/>
   <block-list:block block-list:abbreviated-name=":fjerde rod:" 
block-list:name="∜"/>
@@ -933,7 +947,6 @@
   <block-list:block block-list:abbreviated-name=":forsigtig:" 
block-list:name="☡"/>
   <block-list:block block-list:abbreviated-name=":forskellig fra:" 
block-list:name="≠"/>
   <block-list:block block-list:abbreviated-name=":første kvarter:" 
block-list:name="🌓"/>
-  <block-list:block block-list:abbreviated-name=":forundret:" 
block-list:name="😖"/>
   <block-list:block block-list:abbreviated-name=":forvirret:" 
block-list:name="😕"/>
   <block-list:block block-list:abbreviated-name=":fransk lilje:" 
block-list:name="⚜"/>
   <block-list:block block-list:abbreviated-name=":fred:" 
block-list:name="☮"/>
@@ -946,11 +959,15 @@
   <block-list:block block-list:abbreviated-name=":fuldmåne:" 
block-list:name="🌕"/>
   <block-list:block block-list:abbreviated-name=":fyrretræ:" 
block-list:name="🌲"/>
   <block-list:block block-list:abbreviated-name=":fyrværkeri:" 
block-list:name="🎆"/>
+  <block-list:block block-list:abbreviated-name=":^gamma:" 
block-list:name="ᵞ"/>
+  <block-list:block block-list:abbreviated-name=":_gamma:" 
block-list:name="ᵧ"/>
   <block-list:block block-list:abbreviated-name=":gamma:" 
block-list:name="γ"/>
   <block-list:block block-list:abbreviated-name=":Gamma:" 
block-list:name="Γ"/>
   <block-list:block block-list:abbreviated-name=":gange2:" 
block-list:name="✖"/>
   <block-list:block block-list:abbreviated-name=":gave:" 
block-list:name="🎁"/>
   <block-list:block block-list:abbreviated-name=":gavehjerte:" 
block-list:name="💝"/>
+  <block-list:block block-list:abbreviated-name=":^g:" block-list:name="ᵍ"/>
+  <block-list:block block-list:abbreviated-name=":^G:" block-list:name="á´³"/>
   <block-list:block block-list:abbreviated-name=":gear:" 
block-list:name="⚙"/>
   <block-list:block block-list:abbreviated-name=":ged:" 
block-list:name="🐐"/>
   <block-list:block block-list:abbreviated-name=":genbrug2:" 
block-list:name="♻"/>
@@ -960,7 +977,6 @@
   <block-list:block block-list:abbreviated-name=":gift:" block-list:name="☠
"/>
   <block-list:block block-list:abbreviated-name=":glad kat:" 
block-list:name="😹"/>
   <block-list:block block-list:abbreviated-name=":glæde:" 
block-list:name="🙋"/>
-  <block-list:block block-list:abbreviated-name=":glemt bagage:" 
block-list:name="🛅"/>
   <block-list:block block-list:abbreviated-name=":glimmer:" 
block-list:name="❇"/>
   <block-list:block block-list:abbreviated-name=":gnister:" 
block-list:name="✨"/>
   <block-list:block block-list:abbreviated-name=":g-nøgle:" 
block-list:name="𝄞"/>
@@ -982,6 +998,7 @@
   <block-list:block block-list:abbreviated-name=":&gt;=:" 
block-list:name="≥"/>
   <block-list:block block-list:abbreviated-name=":&gt;&gt;:" 
block-list:name="≫"/>
   <block-list:block block-list:abbreviated-name=":guitar:" 
block-list:name="🎸"/>
+  <block-list:block block-list:abbreviated-name=":hængebane:" 
block-list:name="🚟"/>
   <block-list:block block-list:abbreviated-name=":hakke:" 
block-list:name="⛏"/>
   <block-list:block block-list:abbreviated-name=":Halloween:" 
block-list:name="🎃"/>
   <block-list:block block-list:abbreviated-name=":halvmåne:" 
block-list:name="🌙"/>
@@ -999,6 +1016,9 @@
   <block-list:block block-list:abbreviated-name=":hat2:" 
block-list:name="👲"/>
   <block-list:block block-list:abbreviated-name=":hat:" 
block-list:name="👒"/>
   <block-list:block block-list:abbreviated-name=":hav:" 
block-list:name="🌊"/>
+  <block-list:block block-list:abbreviated-name=":^h:" block-list:name="Ê°"/>
+  <block-list:block block-list:abbreviated-name=":_h:" block-list:name="ₕ"/>
+  <block-list:block block-list:abbreviated-name=":^H:" block-list:name="á´´"/>
   <block-list:block block-list:abbreviated-name=":helikopter:" 
block-list:name="🚁"/>
   <block-list:block block-list:abbreviated-name=":helnode:" 
block-list:name="𝅝"/>
   <block-list:block block-list:abbreviated-name=":hel pause:" 
block-list:name="𝄻"/>
@@ -1046,6 +1066,9 @@
   <block-list:block block-list:abbreviated-name=":hvid løber:" 
block-list:name="♗"/>
   <block-list:block block-list:abbreviated-name=":hvid springer:" 
block-list:name="♘"/>
   <block-list:block block-list:abbreviated-name=":hvidt tårn:" 
block-list:name="♖"/>
+  <block-list:block block-list:abbreviated-name=":^i:" block-list:name="ⁱ"/>
+  <block-list:block block-list:abbreviated-name=":_i:" block-list:name="áµ¢"/>
+  <block-list:block block-list:abbreviated-name=":^I:" block-list:name="á´µ"/>
   <block-list:block block-list:abbreviated-name=":ikke:" block-list:name="¬"/>
   <block-list:block block-list:abbreviated-name=":ikke delmængde:" 
block-list:name="⊄"/>
   <block-list:block block-list:abbreviated-name=":ikke divisor i:" 
block-list:name="∤"/>
@@ -1069,11 +1092,15 @@
   <block-list:block block-list:abbreviated-name=":integral4:" 
block-list:name="∮"/>
   <block-list:block block-list:abbreviated-name=":integral5:" 
block-list:name="∰"/>
   <block-list:block block-list:abbreviated-name=":integral:" 
block-list:name="∫"/>
+  <block-list:block block-list:abbreviated-name=":^iota:" 
block-list:name="ᶥ"/>
   <block-list:block block-list:abbreviated-name=":iota:" block-list:name="ι"/>
   <block-list:block block-list:abbreviated-name=":Iota:" block-list:name="Ι"/>
   <block-list:block block-list:abbreviated-name=":is:" block-list:name="🍨"/>
   <block-list:block block-list:abbreviated-name=":ja:" block-list:name="👍"/>
   <block-list:block block-list:abbreviated-name=":Japan:" 
block-list:name="🗾"/>
+  <block-list:block block-list:abbreviated-name=":^j:" block-list:name="ʲ"/>
+  <block-list:block block-list:abbreviated-name=":_j:" block-list:name="â±¼"/>
+  <block-list:block block-list:abbreviated-name=":^J:" block-list:name="á´¶"/>
   <block-list:block block-list:abbreviated-name=":jeans:" 
block-list:name="👖"/>
   <block-list:block block-list:abbreviated-name=":Jerusalem-kors:" 
block-list:name="☩"/>
   <block-list:block block-list:abbreviated-name=":joker:" 
block-list:name="🃏"/>
@@ -1108,6 +1135,9 @@
   <block-list:block block-list:abbreviated-name=":kat med hjerteformede 
øjne:" block-list:name="😻"/>
   <block-list:block block-list:abbreviated-name=":kat med smørret grin:" 
block-list:name="😼"/>
   <block-list:block block-list:abbreviated-name=":kat med trutmund:" 
block-list:name="😾"/>
+  <block-list:block block-list:abbreviated-name=":^k:" block-list:name="ᵏ"/>
+  <block-list:block block-list:abbreviated-name=":_k:" block-list:name="ₖ"/>
+  <block-list:block block-list:abbreviated-name=":^K:" block-list:name="á´·"/>
   <block-list:block block-list:abbreviated-name=":kim:" 
block-list:name="🌱"/>
   <block-list:block block-list:abbreviated-name=":kimono:" 
block-list:name="👘"/>
   <block-list:block block-list:abbreviated-name=":kirke:" 
block-list:name="⛪"/>
@@ -1190,6 +1220,9 @@
   <block-list:block block-list:abbreviated-name=":lastbil:" 
block-list:name="⛟"/>
   <block-list:block block-list:abbreviated-name=":lastvogn:" 
block-list:name="🚛"/>
   <block-list:block block-list:abbreviated-name=":Latinsk kors:" 
block-list:name="✝"/>
+  <block-list:block block-list:abbreviated-name=":^l:" block-list:name="Ë¡"/>
+  <block-list:block block-list:abbreviated-name=":_l:" block-list:name="ₗ"/>
+  <block-list:block block-list:abbreviated-name=":^L:" block-list:name="á´¸"/>
   <block-list:block block-list:abbreviated-name=":leopard:" 
block-list:name="🐆"/>
   <block-list:block block-list:abbreviated-name=":ler:" 
block-list:name="😆"/>
   <block-list:block block-list:abbreviated-name=":letbane:" 
block-list:name="🚈"/>
@@ -1238,6 +1271,9 @@
   <block-list:block block-list:abbreviated-name=":mariehøne:" 
block-list:name="🐞"/>
   <block-list:block block-list:abbreviated-name=":maske:" 
block-list:name="😷"/>
   <block-list:block block-list:abbreviated-name=":massage:" 
block-list:name="💆"/>
+  <block-list:block block-list:abbreviated-name=":^m:" block-list:name="ᵐ"/>
+  <block-list:block block-list:abbreviated-name=":_m:" block-list:name="ₘ"/>
+  <block-list:block block-list:abbreviated-name=":^M:" block-list:name="á´¹"/>
   <block-list:block block-list:abbreviated-name=":medicin:" 
block-list:name="⚕"/>
   <block-list:block block-list:abbreviated-name=":mega:" 
block-list:name="📣"/>
   <block-list:block block-list:abbreviated-name=":mellemstor stjerne:" 
block-list:name="⭐"/>
@@ -1274,6 +1310,9 @@
   <block-list:block block-list:abbreviated-name=":nat:" 
block-list:name="🌃"/>
   <block-list:block block-list:abbreviated-name=":naturlig:" 
block-list:name="♮"/>
   <block-list:block block-list:abbreviated-name=":navn:" 
block-list:name="📛"/>
+  <block-list:block block-list:abbreviated-name=":^n:" block-list:name="ⁿ"/>
+  <block-list:block block-list:abbreviated-name=":_n:" block-list:name="ₙ"/>
+  <block-list:block block-list:abbreviated-name=":^N:" block-list:name="á´º"/>
   <block-list:block block-list:abbreviated-name=":N:" block-list:name="↑"/>
   <block-list:block block-list:abbreviated-name=":NE:" block-list:name="↗"/>
   <block-list:block block-list:abbreviated-name=":ned2:" 
block-list:name="👇"/>
@@ -1299,6 +1338,9 @@
   <block-list:block block-list:abbreviated-name=":Ny:" block-list:name="Ν"/>
   <block-list:block block-list:abbreviated-name=":nymåne2:" 
block-list:name="🌚"/>
   <block-list:block block-list:abbreviated-name=":nymåne:" 
block-list:name="🌑"/>
+  <block-list:block block-list:abbreviated-name=":^o:" block-list:name="ᵒ"/>
+  <block-list:block block-list:abbreviated-name=":_o:" block-list:name="ₒ"/>
+  <block-list:block block-list:abbreviated-name=":^O:" block-list:name="á´¼"/>
   <block-list:block block-list:abbreviated-name=":oden:" 
block-list:name="🍢"/>
   <block-list:block block-list:abbreviated-name=":og:" block-list:name="∧"/>
   <block-list:block block-list:abbreviated-name=":øjne:" 
block-list:name="👀"/>
@@ -1341,6 +1383,9 @@
   <block-list:block block-list:abbreviated-name=":partitur:" 
block-list:name="🎼"/>
   <block-list:block block-list:abbreviated-name=":paskontrol:" 
block-list:name="🛂"/>
   <block-list:block block-list:abbreviated-name=":pastil:" 
block-list:name="◊"/>
+  <block-list:block block-list:abbreviated-name=":^p:" block-list:name="ᵖ"/>
+  <block-list:block block-list:abbreviated-name=":_p:" block-list:name="ₚ"/>
+  <block-list:block block-list:abbreviated-name=":^P:" block-list:name="á´¾"/>
   <block-list:block block-list:abbreviated-name=":pengeautomat:" 
block-list:name="🏧"/>
   <block-list:block block-list:abbreviated-name=":penge:" 
block-list:name="💸"/>

... etc. - the rest is truncated

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