[Libreoffice-commits] core.git: Branch 'private/jmux/meson' - 67 commits - accessibility/meson.build animations/meson.build avmedia/meson.build basctl/meson.build basegfx/meson.build basic/meson.build binaryurp/meson.build bin/run bridges/meson.build canvas/meson.build chart2/meson.build codemaker/meson.build comphelper/meson.build config_host/config_cxxabi.h.meson config_host/config_dconf.h.meson config_host/config_firebird.h.meson config_host/config_lgpl.h.meson config_host/config_python.h.meson config_host/config_skia.h.meson config_host/meson.build configmgr/meson.build connectivity/meson.build cppcanvas/meson.build cppuhelper/meson.build cppuhelper/unotypes cppu/meson.build cui/meson.build dbaccess/meson.build desktop/meson.build drawinglayer/meson.build dtrans/meson.build editeng/meson.build embeddedobj/meson.build emfio/meson.build eventattacher/meson.build extensions/meson.build external/clew filter/meson.build forms/meson.build formula/meson.build fpicker/meson.build framework/meson.buil d helpcompiler/meson.build hwpfilter/meson.build i18nlangtag/meson.build i18npool/breakgen.py i18npool/localedata i18npool/lrl_include.hxx i18npool/meson.build i18npool/oogen.py i18nutil/meson.build idlc/meson.build idl/meson.build io/meson.build jvmfwk/meson.build lingucomponent/meson.build linguistic/meson.build lotuswordpro/meson.build meson.build offapi/offapihbuilder.py officecfg/Office oox/meson.build opencl/meson.build package/meson.build pyuno/meson.build registry/meson.build remotebridges/meson.build reportdesign/meson.build salhelper/meson.build sal/meson.build sax/meson.build sc/meson.build scripting/meson.build sc/scslots.hxx sdext/meson.build sd/meson.build sd/sdgslots.hxx sd/sdslots.hxx sfx2/meson.build shell/meson.build slideshow/meson.build smoketest/meson.build sot/meson.build starmath/meson.build starmath/smslots.hxx stoc/meson.build store/meson.build svgio/meson.build svl/meson.build svtools/meson.build svx/meson.build sw/meson.build sw/swslots.hxx toolkit/meson.b uild tools/meson.build ucbhelper/meson.build ucb/meson.build udkapi/headerbuilder.py UnoControls/meson.build unoidl/meson.build unotest/meson.build unotools/meson.build unoxml/meson.build uui/meson.build vbahelper/meson.build vcl/meson.build vcl/qt5 vcl/unx wizards/meson.build wizards/source writerperfect/meson.build xmloff/meson.build xmlreader/meson.build xmlscript/meson.build

Jan-Marek Glogowski (via logerrit) logerrit at kemper.freedesktop.org
Tue Mar 17 15:17:36 UTC 2020


Rebased ref, commits from common ancestor:
commit d2082b22ba1e3325ca7d4192ca277ce0dc73de4a
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Tue Mar 17 15:15:48 2020 +0000
Commit:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
CommitDate: Tue Mar 17 15:15:48 2020 +0000

    Fixup
    
    Change-Id: Ib3f16476efd9898c0404f8821c26e8e61946b7bc

diff --git a/bin/run b/bin/run
index 523da3c0e178..3692eee7b80a 100755
--- a/bin/run
+++ b/bin/run
@@ -22,6 +22,7 @@ setdefaults()
     done
 
     exedir="${dir}"/workdir/LinkTarget/Executable
+    exedir="${dir}"/instdir/program
     export URE_BOOTSTRAP=file://"${dir}"/instdir/program/fundamentalrc
 }
 
diff --git a/cppu/meson.build b/cppu/meson.build
index 0ac31d2a86a1..3bbd1fba57cc 100644
--- a/cppu/meson.build
+++ b/cppu/meson.build
@@ -1,4 +1,4 @@
-cppu_lib = shared_library('cppulo',
+cppu_lib = shared_library('uno_cppu',
   'source/cppu/compat.cxx',
   'source/cppu/cppu_opt.cxx',
   'source/threadpool/current.cxx',
@@ -21,9 +21,15 @@ cppu_lib = shared_library('cppulo',
   'source/uno/sequence.cxx',
   udk_fake_h,
   include_directories: [main_inc, udkh_inc],
-  cpp_args: ['-DLIBO_INTERNAL_ONLY',
-             '-DCPPU_DLLIMPLEMENTATION'],
-  link_with: [salhelper_lib, sal_lib],
+  cpp_args: [
+    '-DCPPU_DLLIMPLEMENTATION',
+    '-DLIBO_INTERNAL_ONLY',
+  ],
+  link_with: [
+    sal_lib,
+    salhelper_lib,
+  ],
+  soversion : '3',
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
diff --git a/cppuhelper/meson.build b/cppuhelper/meson.build
index e532350e31df..740fa147a93f 100644
--- a/cppuhelper/meson.build
+++ b/cppuhelper/meson.build
@@ -6,7 +6,7 @@ temp_hack = static_library('cppuuno',
   include_directories: [main_inc, udkh_inc, offapi_inc, cpphelper_uno_inc],
 )
 
-cppuhelper_lib = shared_library('cppuhelperlo',
+cppuhelper_lib = shared_library('uno_cppuhelpergcc3',
   'source/access_control.cxx',
   'source/bootstrap.cxx',
   'source/compat.cxx',
@@ -33,7 +33,10 @@ cppuhelper_lib = shared_library('cppuhelperlo',
   'source/findsofficepath.c',
   udk_fake_h, off_fake_h, cppuhelper_fake_h,
   include_directories: [main_inc, udkh_inc, offapi_inc, cpphelper_uno_inc],
-  cpp_args: ['-DCPPUHELPER_DLLIMPLEMENTATION', '-DLIBO_INTERNAL_ONLY'],
+  cpp_args: [
+    '-DCPPUHELPER_DLLIMPLEMENTATION',
+    '-DLIBO_INTERNAL_ONLY',
+  ],
   link_with: [
     cppu_lib,
     reg_lib,
@@ -43,6 +46,7 @@ cppuhelper_lib = shared_library('cppuhelperlo',
     unoidl_lib,
     xmlreader_lib
   ],
+  soversion : '3',
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
diff --git a/desktop/meson.build b/desktop/meson.build
index 13e38de7c7a6..102b5c0ac2cd 100644
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -78,7 +78,7 @@ sofficeapp_lib = shared_library('sofficeapp',
   install: true,
 )
 
-soffice_bin = executable('soffice', 'source/app/main.c',
+soffice_bin = executable('soffice.bin', 'source/app/main.c',
   include_directories: [main_inc],
   link_with: [sofficeapp_lib, sal_lib],
   install: true,
diff --git a/i18npool/breakgen.py b/i18npool/breakgen.py
index c38b4385671a..70cc3b1c07f1 100755
--- a/i18npool/breakgen.py
+++ b/i18npool/breakgen.py
@@ -26,7 +26,7 @@ rc = subprocess.call(['genbrk',
 if rc != 0:
     sys.exit(rc)
 
-rc = subprocess.call(['genccode',
+rc = subprocess.call(['/usr/sbin/genccode',
                       '-n',
                       'OpenOffice',
                       '-d',
diff --git a/i18npool/oogen.py b/i18npool/oogen.py
index 5b53552cb196..fd16fc4b519c 100755
--- a/i18npool/oogen.py
+++ b/i18npool/oogen.py
@@ -27,7 +27,7 @@ line.brk
 sent.brk
 ''')
 
-rc = subprocess.call(['gencmn',
+rc = subprocess.call(['/usr/sbin/gencmn',
                       '-n',
                       'OpenOffice',
                       '-t',
diff --git a/meson.build b/meson.build
index 34e75d21b7b4..b77c19e6e6dc 100644
--- a/meson.build
+++ b/meson.build
@@ -100,6 +100,9 @@ lex_bin = find_program('flex')
 bison_bin = find_program('bison')
 xslt_bin = find_program('xsltproc')
 gentokens_bin = find_program('solenv/bin/generate-tokens.pl')
+gencmn_bin = find_program('gencmn', '/usr/sbin/gencmn')
+genccode_bin = find_program('genccode', '/usr/sbin/genccode')
+genbrk_bin = find_program('genbrk', '/usr/sbin/genbrk')
 
 cppunit_dep = dependency('cppunit')
 langtag_dep = dependency('liblangtag')
@@ -149,7 +152,7 @@ raptor2_dep = dependency('raptor2')
 rasqal_dep = dependency('rasqal')
 librdf_dep = cpp.find_library('rdf')
 curl_dep = dependency('libcurl')
-python3_dep = dependency('python3')
+python3_dep = dependency('python3-embed')
 odbc_dep = declare_dependency(include_directories: 'external/unixODBC/inc')
 hunspell_dep = dependency('hunspell')
 hyphen_dep = cpp.find_library('hyphen')
diff --git a/pyuno/meson.build b/pyuno/meson.build
index 9341ccb09b66..7d22b7cac505 100644
--- a/pyuno/meson.build
+++ b/pyuno/meson.build
@@ -14,7 +14,12 @@ pyuno_lib = shared_library('pyuno',
   cpp_args: ['-DLO_DLLIMPLEMENTATION_PYUNO',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, 'inc'],
-  link_with: [cppu_lib, cppuhelper_lib, sal_lib, salhelper_lib],
+  link_with: [
+    cppu_lib,
+    cppuhelper_lib,
+    sal_lib,
+    salhelper_lib,
+  ],
   dependencies: [python3_dep],
   install: true,
 )
diff --git a/sal/meson.build b/sal/meson.build
index 61ff8f6136ee..ecaf43dc289d 100644
--- a/sal/meson.build
+++ b/sal/meson.build
@@ -68,7 +68,7 @@ else
   system_link_args = []
 endif
 
-sal_lib = shared_library('sallo',
+sal_lib = shared_library('uno_sal',
   'rtl/alloc_arena.cxx',
   'rtl/alloc_cache.cxx',
   'rtl/alloc_fini.cxx',
@@ -121,6 +121,7 @@ sal_lib = shared_library('sallo',
     osx_frameworks_dep,
     thread_dep,
   ],
+  soversion : '3',
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
diff --git a/salhelper/meson.build b/salhelper/meson.build
index 8e9e4b007e79..d639378ad859 100644
--- a/salhelper/meson.build
+++ b/salhelper/meson.build
@@ -1,13 +1,18 @@
-salhelper_lib = shared_library('salhelperlo',
+salhelper_lib = shared_library('uno_salhelpergcc3',
   'source/condition.cxx',
   'source/dynload.cxx',
   'source/simplereferenceobject.cxx',
   'source/thread.cxx',
   'source/timer.cxx',
   include_directories: [main_inc],
-  cpp_args: ['-DLIBO_INTERNAL_ONLY',
-             '-DSALHELPER_DLLIMPLEMENTATION'],
-  link_with: sal_lib,
+  cpp_args: [
+    '-DLIBO_INTERNAL_ONLY',
+    '-DSALHELPER_DLLIMPLEMENTATION',
+  ],
+  link_with: [
+    sal_lib,
+  ],
+  soversion : '3',
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
diff --git a/sc/meson.build b/sc/meson.build
index f5141ae36c44..c81d3fc6e5ff 100644
--- a/sc/meson.build
+++ b/sc/meson.build
@@ -656,7 +656,7 @@ sc_lib = shared_library('sclo',
     libxml_dep,
     icuuc_dep,
     icu18_dep,
-    broken_mdds_dep,
+    mdds_dep,
     orcus_dep,
   ],
   gnu_symbol_visibility: 'hidden',
diff --git a/vcl/meson.build b/vcl/meson.build
index ea4614d72f01..d65df1190c97 100644
--- a/vcl/meson.build
+++ b/vcl/meson.build
@@ -422,7 +422,7 @@ vcl_lib = shared_library('vcllo',
              '-DDLLIMPLEMENTATION_UITEST',
              '-DCUI_DLL_NAME="libcuilo.so"',
              '-DGLM_ENABLE_EXPERIMENTAL',
-             '-DDESKTOP_DETECTOR_DLL_NAME="libdesktopdetector.so"',
+             '-DDESKTOP_DETECTOR_DLL_NAME="libdesktop_detectorlo.so"',
              '-DTK_DLL_NAME="libtklo.so"'],
   link_with: [
     basegfx_lib,
@@ -636,7 +636,7 @@ executable('vcldemo',
   ],
 )
 
-desktopdetector_lib = shared_library('desktopdetector',
+desktopdetector_lib = shared_library('desktop_detectorlo',
   'unx/generic/desktopdetect/desktopdetector.cxx',
   udk_fake_h, off_fake_h,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
@@ -654,7 +654,9 @@ desktopdetector_lib = shared_library('desktopdetector',
     cppu_lib,
     sal_lib,
   ],
-  dependencies: [x11_dep],
+  dependencies: [
+    x11_core_dep,
+  ],
   install: true,
 )
 
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 970373ff86bc..224fc76ed258 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -536,7 +536,7 @@ void* Qt5Instance::CreateGStreamerSink(const SystemChildWindow* pWindow)
 
     return pVideosink;
 #else
-    (void*)pWindow;
+    Q_UNUSED(pWindow);
     return nullptr;
 #endif
 }
commit 205bc6906efc1e640a8f63e55787e1e316df6b56
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Sat Mar 7 09:18:06 2020 +0100
Commit:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
CommitDate: Sat Mar 14 23:37:06 2020 +0000

    Add some more hidden visibiity flags
    
    Change-Id: I0af0619c2730c0ca6e91fb59b4387372c6ff77a3

diff --git a/sc/meson.build b/sc/meson.build
index 10f8c8b10149..f5141ae36c44 100644
--- a/sc/meson.build
+++ b/sc/meson.build
@@ -658,7 +658,7 @@ sc_lib = shared_library('sclo',
     icu18_dep,
     broken_mdds_dep,
     orcus_dep,
-  ], 
+  ],
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
commit 375d615da2b9c77b542e697d6d2f38bc83b2f891
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Sat Mar 7 09:07:18 2020 +0100
Commit:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
CommitDate: Sat Mar 14 23:36:29 2020 +0000

    fix orcus
    
    Change-Id: I7f9266f6ba6730f318792749c3a04b93fee7e6b0

diff --git a/sc/meson.build b/sc/meson.build
index 7be12d07a706..10f8c8b10149 100644
--- a/sc/meson.build
+++ b/sc/meson.build
@@ -754,7 +754,7 @@ scui_lib = shared_library('scuilo',
   install: true,
 )
 
-scfilt_lib = shared_library('scfilt',
+scfilt_lib = shared_library('scfiltlo',
   'source/filter/dif/difexp.cxx',
   'source/filter/dif/difimp.cxx',
   'source/filter/excel/colrowst.cxx',
@@ -952,6 +952,7 @@ scfilt_lib = shared_library('scfilt',
     i18nlangtag_lib,
   ],
   dependencies: [orcus_dep, mdds_dep],
+  gnu_symbol_visibility: 'hidden',
   install: true,
 )
 
commit edb091f8cefadcdf943e066c8c7212f285504f92
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Sat Mar 7 09:03:44 2020 +0100
Commit:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
CommitDate: Sat Mar 14 23:36:28 2020 +0000

    fixup kf
    
    Change-Id: Ia4d14c39e01502d8f03cf30985cf3065bdc70973

diff --git a/vcl/meson.build b/vcl/meson.build
index b0cd137469e7..ea4614d72f01 100644
--- a/vcl/meson.build
+++ b/vcl/meson.build
@@ -784,5 +784,6 @@ vclplug_kf5 = shared_library('vclplug_kf5lo',
     kf5_kio_filewidgets_dep,
     qt5_dep,
   ],
+  gnu_symbol_visibility: 'hidden',
   install : true,
 )
commit e7824e3ad78ef36ec619d141d2cf9a46b5dc859f
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Sat Mar 7 09:03:33 2020 +0100
Commit:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
CommitDate: Sat Mar 14 23:36:28 2020 +0000

    fixup qt
    
    Change-Id: Ia864aa9a3c6920d583ab37ce6fb963c7de9a87b3

diff --git a/vcl/meson.build b/vcl/meson.build
index 95ae18ba9ffd..b0cd137469e7 100644
--- a/vcl/meson.build
+++ b/vcl/meson.build
@@ -737,6 +737,7 @@ vclplug_qt5 = shared_library('vclplug_qt5lo',
     qt5_dep,
     qt5_x11_dep,
   ],
+  gnu_symbol_visibility: 'hidden',
   install : true,
 )
 
commit 4b65b9d8000ddfb9c43247e7fa29790a1f2195f9
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Sun Feb 23 00:04:26 2020 +0000
Commit:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
CommitDate: Sat Mar 14 23:36:26 2020 +0000

    Build gen / x11 VCL backend without skia
    
    Change-Id: Ia2bc07cca816bbb03b636660405d375af0ac0d35

diff --git a/config_host/config_skia.h.meson b/config_host/config_skia.h.meson
new file mode 100644
index 000000000000..0d0d8bde1a5b
--- /dev/null
+++ b/config_host/config_skia.h.meson
@@ -0,0 +1,6 @@
+#ifndef CONFIG_SKIA_H
+#define CONFIG_SKIA_H
+
+#mesondefine HAVE_FEATURE_SKIA
+
+#endif
diff --git a/config_host/meson.build b/config_host/meson.build
index b34a2a0f4990..48aebf52e1a7 100644
--- a/config_host/meson.build
+++ b/config_host/meson.build
@@ -108,6 +108,8 @@ cdata.set10('HAVE_CXXABI_H_VMI_CLASS_TYPE_INFO', true)
 
 cdata.set10('HAVE_DCONF', false)
 
+cdata.set10('HAVE_FEATURE_SKIA', false)
+
 configure_file(input: 'config_typesizes.h.meson',
   output: 'config_typesizes.h',
   configuration: cdata)
@@ -244,6 +246,6 @@ configure_file(input: 'config_dconf.h.meson',
   output: 'config_dconf.h',
   configuration: cdata)
 
-configure_file(input: 'config_skia.h.in',
+configure_file(input: 'config_skia.h.meson',
   output: 'config_skia.h',
   configuration: cdata)
diff --git a/meson.build b/meson.build
index 58fc36c0f49e..34e75d21b7b4 100644
--- a/meson.build
+++ b/meson.build
@@ -128,12 +128,6 @@ gtk3_dep = dependency('gtk+-3.0')
 gtkprint_dep = dependency('gtk+-unix-print-3.0')
 dbus_dep = dependency('dbus-1')
 gio_dep = dependency('gio-2.0')
-xext_dep = dependency('xext')
-x11_dep = dependency('x11')
-xrandr_dep = dependency('xrandr')
-xrender_dep = dependency('xrender')
-sm_dep = dependency('sm')
-ice_dep = dependency('ice')
 fc_dep = dependency('fontconfig')
 orcus_dep = dependency('liborcus-0.15')
 clucene_dep = dependency('libclucene-core')
@@ -162,6 +156,13 @@ hyphen_dep = cpp.find_library('hyphen')
 mythes_dep = dependency('mythes')
 libexttextcat_dep = dependency('libexttextcat')
 
+x11_core_dep = dependency('x11')
+x11_ice_dep = dependency('ice')
+x11_sm_dep = dependency('sm')
+x11_xext_dep = dependency('xext')
+x11_xrandr_dep = dependency('xrandr')
+x11_xrender_dep = dependency('xrender')
+
 qt5 = import('qt5')
 qt5_dep = dependency('qt5', modules: ['Core', 'Gui', 'Widgets'])
 qt5_x11_dep = dependency('qt5', modules: ['X11Extras'])
diff --git a/vcl/meson.build b/vcl/meson.build
index da938ede5110..95ae18ba9ffd 100644
--- a/vcl/meson.build
+++ b/vcl/meson.build
@@ -1,6 +1,6 @@
 glxtest_lib = static_library('glxtest', 'unx/glxtest.cxx',
   include_directories: [main_inc, 'inc'],
-  dependencies: [x11_dep, dl_dep],
+  dependencies: [x11_core_dep, dl_dep],
 )
 
 vcl_lib = shared_library('vcllo',
@@ -456,9 +456,9 @@ vcl_lib = shared_library('vcllo',
     jpg_dep,
     lcms_dep,
     png_dep,
-    x11_dep,
-    xext_dep,
-  ], 
+    x11_core_dep,
+    x11_xext_dep,
+  ],
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
@@ -522,7 +522,7 @@ vclplug_gtk3 = shared_library('vclplug_gtk3lo',
     epoxy_dep,
     gtk3_dep,
     gtkprint_dep,
-    x11_dep,
+    x11_core_dep,
   ],
   gnu_symbol_visibility: 'hidden',
   install: true,
@@ -592,12 +592,12 @@ vclplug_gen = shared_library('vclplug_genlo',
     epoxy_dep,
     freetype_dep,
     harfbuzz_dep,
-    ice_dep,
-    sm_dep,
-    x11_dep,
-    xext_dep,
-    xrandr_dep,
-    xrender_dep,
+    x11_core_dep,
+    x11_ice_dep,
+    x11_sm_dep,
+    x11_xext_dep,
+    x11_xrandr_dep,
+    x11_xrender_dep,
   ], 
   gnu_symbol_visibility: 'hidden',
   install: true,
commit 7e839c8f4826b59c0df03a6b5d67c4fa2d5cf1f0
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Sat Feb 22 23:22:38 2020 +0000
Commit:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
CommitDate: Sat Mar 14 23:35:10 2020 +0000

    Use Ubuntu focal LO Java build dependencies
    
    This is the Java version installed by:
    apt-get build-dep libreoffice
    
    Also drop the duplicate cairo dependency variable.
    
    Change-Id: Id34defc63700825f2925e6284f1ccfdad05b85bb

diff --git a/meson.build b/meson.build
index c540a6739a7a..58fc36c0f49e 100644
--- a/meson.build
+++ b/meson.build
@@ -135,7 +135,6 @@ xrender_dep = dependency('xrender')
 sm_dep = dependency('sm')
 ice_dep = dependency('ice')
 fc_dep = dependency('fontconfig')
-cairo_dep = dependency('cairo')
 orcus_dep = dependency('liborcus-0.15')
 clucene_dep = dependency('libclucene-core')
 libxslt_dep = dependency('libxslt')
@@ -176,8 +175,8 @@ mdds_dep = dependency('mdds-1.5')
 
 # FIXME. Java does not provide .pc files.
 # Presumably this data can be obtained via other methods.
-jni_dep = declare_dependency(compile_args: ['-I/usr/lib/jvm/java-13-openjdk-amd64/include',
-                                            '-I/usr/lib/jvm/java-13-openjdk-amd64/include/linux'])
+jni_dep = declare_dependency(compile_args: ['-I/usr/lib/jvm/java-11-openjdk-amd64/include',
+                                            '-I/usr/lib/jvm/java-11-openjdk-amd64/include/linux'])
 
 subdir('config_host')
 subdir('sal')
commit 787f5c9fabac04eb3334a8f4785c20aa4b7e91f8
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Sat Feb 22 23:21:35 2020 +0000
Commit:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
CommitDate: Sat Mar 14 23:35:08 2020 +0000

    Build needs mdds >= 0.15
    
    Change-Id: Ib9d820d7bb4d55af3ca037e79cc6139f428e5399

diff --git a/meson.build b/meson.build
index 3fdea454dd15..c540a6739a7a 100644
--- a/meson.build
+++ b/meson.build
@@ -172,10 +172,7 @@ kf5_i18n_dep = dependency('KF5I18n')
 kf5_config_dep = dependency('KF5KIO', modules: 'KF5::ConfigCore')
 kf5_winsys_dep = dependency('KF5WindowSystem')
 
-# The version in Ubuntu eoan is too old.
-#mdds_dep = dependency('mdds-1.5')
-mdds_dep = declare_dependency(include_directories: 'mdds')
-broken_mdds_dep = declare_dependency(include_directories: '.')
+mdds_dep = dependency('mdds-1.5')
 
 # FIXME. Java does not provide .pc files.
 # Presumably this data can be obtained via other methods.
diff --git a/sc/meson.build b/sc/meson.build
index ea99b2659bed..7be12d07a706 100644
--- a/sc/meson.build
+++ b/sc/meson.build
@@ -749,7 +749,7 @@ scui_lib = shared_library('scuilo',
     utl_lib,
     vcl_lib,
   ],
-  dependencies: [broken_mdds_dep],
+  dependencies: [mdds_dep],
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
@@ -951,7 +951,7 @@ scfilt_lib = shared_library('scfilt',
     vcl_lib,
     i18nlangtag_lib,
   ],
-  dependencies: [orcus_dep, broken_mdds_dep],
+  dependencies: [orcus_dep, mdds_dep],
   install: true,
 )
 
@@ -1045,7 +1045,9 @@ vbaobj_lib = shared_library('vbaobjlo',
     vbahelper_lib,
     vcl_lib,
   ],
-  dependencies: [broken_mdds_dep],
+  dependencies: [
+    mdds_dep,
+  ],
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
commit be1f3e4621a2eda792ca1955c87c35d5da347979
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Sat Feb 22 23:18:38 2020 +0000
Commit:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
CommitDate: Sat Mar 14 23:34:22 2020 +0000

    Build needs Orcus >= 0.15
    
    Change-Id: I70df961a08e2db533a81cca5d214e1300a13eb2e

diff --git a/meson.build b/meson.build
index 3890bf051652..3fdea454dd15 100644
--- a/meson.build
+++ b/meson.build
@@ -136,7 +136,7 @@ sm_dep = dependency('sm')
 ice_dep = dependency('ice')
 fc_dep = dependency('fontconfig')
 cairo_dep = dependency('cairo')
-orcus_dep = dependency('liborcus-0.14')
+orcus_dep = dependency('liborcus-0.15')
 clucene_dep = dependency('libclucene-core')
 libxslt_dep = dependency('libxslt')
 qrcodegen_dep = declare_dependency(compile_args: ['-I/usr/include/qrcodegen'],
diff --git a/sc/meson.build b/sc/meson.build
index 5c004c90f776..ea99b2659bed 100644
--- a/sc/meson.build
+++ b/sc/meson.build
@@ -753,201 +753,207 @@ scui_lib = shared_library('scuilo',
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
-# I had to disable this because it gave a compiler error:
-#
-# ‘class orcus::orcus_xml’ has no member named ‘set_range_row_group’
-#
-# Maybe the Orcus version is too old?
-#scfilt_lib = shared_library('scfiltlo',
-#  'source/filter/dif/difexp.cxx',
-#  'source/filter/dif/difimp.cxx',
-#  'source/filter/excel/colrowst.cxx',
-#  'source/filter/excel/excdoc.cxx',
-#  'source/filter/excel/excel.cxx',
-#  'source/filter/excel/excform.cxx',
-#  'source/filter/excel/excform8.cxx',
-#  'source/filter/excel/excimp8.cxx',
-#  'source/filter/excel/excrecds.cxx',
-#  'source/filter/excel/exctools.cxx',
-#  'source/filter/excel/expop2.cxx',
-#  'source/filter/excel/fontbuff.cxx',
-#  'source/filter/excel/frmbase.cxx',
-#  'source/filter/excel/impop.cxx',
-#  'source/filter/excel/namebuff.cxx',
-#  'source/filter/excel/read.cxx',
-#  'source/filter/excel/tokstack.cxx',
-#  'source/filter/excel/xechart.cxx',
-#  'source/filter/excel/xecontent.cxx',
-#  'source/filter/excel/xedbdata.cxx',
-#  'source/filter/excel/xeescher.cxx',
-#  'source/filter/excel/xeextlst.cxx',
-#  'source/filter/excel/xeformula.cxx',
-#  'source/filter/excel/xehelper.cxx',
-#  'source/filter/excel/xelink.cxx',
-#  'source/filter/excel/xename.cxx',
-#  'source/filter/excel/xepage.cxx',
-#  'source/filter/excel/xepivot.cxx',
-#  'source/filter/excel/xepivotxml.cxx',
-#  'source/filter/excel/xerecord.cxx',
-#  'source/filter/excel/xeroot.cxx',
-#  'source/filter/excel/xestream.cxx',
-#  'source/filter/excel/xestring.cxx',
-#  'source/filter/excel/xestyle.cxx',
-#  'source/filter/excel/xetable.cxx',
-#  'source/filter/excel/xeview.cxx',
-#  'source/filter/excel/xichart.cxx',
-#  'source/filter/excel/xicontent.cxx',
-#  'source/filter/excel/xiescher.cxx',
-#  'source/filter/excel/xiformula.cxx',
-#  'source/filter/excel/xihelper.cxx',
-#  'source/filter/excel/xilink.cxx',
-#  'source/filter/excel/xiname.cxx',
-#  'source/filter/excel/xipage.cxx',
-#  'source/filter/excel/xipivot.cxx',
-#  'source/filter/excel/xiroot.cxx',
-#  'source/filter/excel/xistream.cxx',
-#  'source/filter/excel/xistring.cxx',
-#  'source/filter/excel/xistyle.cxx',
-#  'source/filter/excel/xiview.cxx',
-#  'source/filter/excel/xladdress.cxx',
-#  'source/filter/excel/xlchart.cxx',
-#  'source/filter/excel/xlescher.cxx',
-#  'source/filter/excel/xlformula.cxx',
-#  'source/filter/excel/xlpage.cxx',
-#  'source/filter/excel/xlpivot.cxx',
-#  'source/filter/excel/xlroot.cxx',
-#  'source/filter/excel/xlstyle.cxx',
-#  'source/filter/excel/xltoolbar.cxx',
-#  'source/filter/excel/xltools.cxx',
-#  'source/filter/excel/xltracer.cxx',
-#  'source/filter/excel/xlview.cxx',
-#  'source/filter/ftools/fapihelper.cxx',
-#  'source/filter/ftools/fprogressbar.cxx',
-#  'source/filter/ftools/ftools.cxx',
-#  'source/filter/ftools/sharedformulagroups.cxx',
-#  'source/filter/html/htmlexp.cxx',
-#  'source/filter/html/htmlexp2.cxx',
-#  'source/filter/html/htmlimp.cxx',
-#  'source/filter/html/htmlpars.cxx',
-#  'source/filter/lotus/filter.cxx',
-#  'source/filter/lotus/lotattr.cxx',
-#  'source/filter/lotus/lotform.cxx',
-#  'source/filter/lotus/lotimpop.cxx',
-#  'source/filter/lotus/lotread.cxx',
-#  'source/filter/lotus/lotus.cxx',
-#  'source/filter/lotus/memory.cxx',
-#  'source/filter/lotus/op.cxx',
-#  'source/filter/lotus/optab.cxx',
-#  'source/filter/lotus/tool.cxx',
-#  'source/filter/qpro/qpro.cxx',
-#  'source/filter/qpro/qproform.cxx',
-#  'source/filter/qpro/qprostyle.cxx',
-#  'source/filter/rtf/eeimpars.cxx',
-#  'source/filter/rtf/expbase.cxx',
-#  'source/filter/rtf/rtfexp.cxx',
-#  'source/filter/rtf/rtfimp.cxx',
-#  'source/filter/rtf/rtfparse.cxx',
-#  'source/filter/xcl97/XclExpChangeTrack.cxx',
-#  'source/filter/xcl97/XclImpChangeTrack.cxx',
-#  'source/filter/xcl97/xcl97esc.cxx',
-#  'source/filter/xcl97/xcl97rec.cxx',
-#  'source/filter/oox/excelfilter.cxx',
-#  'source/filter/oox/addressconverter.cxx',
-#  'source/filter/oox/autofilterbuffer.cxx',
-#  'source/filter/oox/autofiltercontext.cxx',
-#  'source/filter/oox/biffhelper.cxx',
-#  'source/filter/oox/chartsheetfragment.cxx',
-#  'source/filter/oox/commentsbuffer.cxx',
-#  'source/filter/oox/commentsfragment.cxx',
-#  'source/filter/oox/condformatbuffer.cxx',
-#  'source/filter/oox/condformatcontext.cxx',
-#  'source/filter/oox/connectionsbuffer.cxx',
-#  'source/filter/oox/connectionsfragment.cxx',
-#  'source/filter/oox/defnamesbuffer.cxx',
-#  'source/filter/oox/drawingbase.cxx',
-#  'source/filter/oox/drawingfragment.cxx',
-#  'source/filter/oox/excelchartconverter.cxx',
-#  'source/filter/oox/excelhandlers.cxx',
-#  'source/filter/oox/excelvbaproject.cxx',
-#  'source/filter/oox/externallinkbuffer.cxx',
-#  'source/filter/oox/externallinkfragment.cxx',
-#  'source/filter/oox/extlstcontext.cxx',
-#  'source/filter/oox/formulabase.cxx',
-#  'source/filter/oox/formulabuffer.cxx',
-#  'source/filter/oox/formulaparser.cxx',
-#  'source/filter/oox/numberformatsbuffer.cxx',
-#  'source/filter/oox/ooxformulaparser.cxx',
-#  'source/filter/oox/pagesettings.cxx',
-#  'source/filter/oox/pivotcachebuffer.cxx',
-#  'source/filter/oox/pivotcachefragment.cxx',
-#  'source/filter/oox/pivottablebuffer.cxx',
-#  'source/filter/oox/pivottablefragment.cxx',
-#  'source/filter/oox/querytablebuffer.cxx',
-#  'source/filter/oox/querytablefragment.cxx',
-#  'source/filter/oox/revisionfragment.cxx',
-#  'source/filter/oox/richstringcontext.cxx',
-#  'source/filter/oox/richstring.cxx',
-#  'source/filter/oox/scenariobuffer.cxx',
-#  'source/filter/oox/scenariocontext.cxx',
-#  'source/filter/oox/sharedstringsbuffer.cxx',
-#  'source/filter/oox/sharedstringsfragment.cxx',
-#  'source/filter/oox/sheetdatabuffer.cxx',
-#  'source/filter/oox/sheetdatacontext.cxx',
-#  'source/filter/oox/stylesbuffer.cxx',
-#  'source/filter/oox/stylesfragment.cxx',
-#  'source/filter/oox/tablebuffer.cxx',
-#  'source/filter/oox/tablecolumnsbuffer.cxx',
-#  'source/filter/oox/tablecolumnscontext.cxx',
-#  'source/filter/oox/tablefragment.cxx',
-#  'source/filter/oox/themebuffer.cxx',
-#  'source/filter/oox/unitconverter.cxx',
-#  'source/filter/oox/viewsettings.cxx',
-#  'source/filter/oox/workbookfragment.cxx',
-#  'source/filter/oox/workbookhelper.cxx',
-#  'source/filter/oox/workbooksettings.cxx',
-#  'source/filter/oox/worksheetbuffer.cxx',
-#  'source/filter/oox/worksheetfragment.cxx',
-#  'source/filter/oox/worksheethelper.cxx',
-#  'source/filter/oox/worksheetsettings.cxx',
-#  # ?????
-#  'source/filter/orcus/interface.cxx',
-#  'source/filter/orcus/orcusfiltersimpl.cxx',
-#  'source/filter/orcus/xmlcontext.cxx',
-#  'source/filter/orcus/filterdetect.cxx',
-#
-#  udk_fake_h, off_fake_h,
-#  cpp_args: ['-DLIBO_INTERNAL_ONLY'],
-#  include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/filter/inc', 'source/ui/inc', '../oox'],
-#  link_with: [
-#    basegfx_lib,
-#    comphelper_lib,
-#    cppu_lib,
-#    cppuhelper_lib,
-#    drawinglayer_lib,
-#    editeng_lib,
-#    for_lib,
-#    msfilter_lib,
-#    oox_lib,
-#    sal_lib,
-#    salhelper_lib,
-#    sax_lib,
-#    sb_lib,
-#    sc_lib,
-#    sfx_lib,
-#    sot_lib,
-#    svl_lib,
-#    svt_lib,
-#    svx_lib,
-#    svxcore_lib,
-#    tk_lib,
-#    tl_lib,
-#    ucbhelper_lib,
-#    utl_lib,
-#    vcl_lib,
-#    i18nlangtag_lib,
-#  ],
-#  dependencies: [orcus_dep, broken_mdds_dep],
-#)
+
+scfilt_lib = shared_library('scfilt',
+  'source/filter/dif/difexp.cxx',
+  'source/filter/dif/difimp.cxx',
+  'source/filter/excel/colrowst.cxx',
+  'source/filter/excel/excdoc.cxx',
+  'source/filter/excel/excel.cxx',
+  'source/filter/excel/excform.cxx',
+  'source/filter/excel/excform8.cxx',
+  'source/filter/excel/excimp8.cxx',
+  'source/filter/excel/excrecds.cxx',
+  'source/filter/excel/exctools.cxx',
+  'source/filter/excel/expop2.cxx',
+  'source/filter/excel/fontbuff.cxx',
+  'source/filter/excel/frmbase.cxx',
+  'source/filter/excel/impop.cxx',
+  'source/filter/excel/namebuff.cxx',
+  'source/filter/excel/read.cxx',
+  'source/filter/excel/tokstack.cxx',
+  'source/filter/excel/xechart.cxx',
+  'source/filter/excel/xecontent.cxx',
+  'source/filter/excel/xedbdata.cxx',
+  'source/filter/excel/xeescher.cxx',
+  'source/filter/excel/xeextlst.cxx',
+  'source/filter/excel/xeformula.cxx',
+  'source/filter/excel/xehelper.cxx',
+  'source/filter/excel/xelink.cxx',
+  'source/filter/excel/xename.cxx',
+  'source/filter/excel/xepage.cxx',
+  'source/filter/excel/xepivot.cxx',
+  'source/filter/excel/xepivotxml.cxx',
+  'source/filter/excel/xerecord.cxx',
+  'source/filter/excel/xeroot.cxx',
+  'source/filter/excel/xestream.cxx',
+  'source/filter/excel/xestring.cxx',
+  'source/filter/excel/xestyle.cxx',
+  'source/filter/excel/xetable.cxx',
+  'source/filter/excel/xeview.cxx',
+  'source/filter/excel/xichart.cxx',
+  'source/filter/excel/xicontent.cxx',
+  'source/filter/excel/xiescher.cxx',
+  'source/filter/excel/xiformula.cxx',
+  'source/filter/excel/xihelper.cxx',
+  'source/filter/excel/xilink.cxx',
+  'source/filter/excel/xiname.cxx',
+  'source/filter/excel/xipage.cxx',
+  'source/filter/excel/xipivot.cxx',
+  'source/filter/excel/xiroot.cxx',
+  'source/filter/excel/xistream.cxx',
+  'source/filter/excel/xistring.cxx',
+  'source/filter/excel/xistyle.cxx',
+  'source/filter/excel/xiview.cxx',
+  'source/filter/excel/xladdress.cxx',
+  'source/filter/excel/xlchart.cxx',
+  'source/filter/excel/xlescher.cxx',
+  'source/filter/excel/xlformula.cxx',
+  'source/filter/excel/xlpage.cxx',
+  'source/filter/excel/xlpivot.cxx',
+  'source/filter/excel/xlroot.cxx',
+  'source/filter/excel/xlstyle.cxx',
+  'source/filter/excel/xltoolbar.cxx',
+  'source/filter/excel/xltools.cxx',
+  'source/filter/excel/xltracer.cxx',
+  'source/filter/excel/xlview.cxx',
+  'source/filter/ftools/fapihelper.cxx',
+  'source/filter/ftools/fprogressbar.cxx',
+  'source/filter/ftools/ftools.cxx',
+  'source/filter/ftools/sharedformulagroups.cxx',
+  'source/filter/html/htmlexp.cxx',
+  'source/filter/html/htmlexp2.cxx',
+  'source/filter/html/htmlimp.cxx',
+  'source/filter/html/htmlpars.cxx',
+  'source/filter/lotus/filter.cxx',
+  'source/filter/lotus/lotattr.cxx',
+  'source/filter/lotus/lotform.cxx',
+  'source/filter/lotus/lotimpop.cxx',
+  'source/filter/lotus/lotread.cxx',
+  'source/filter/lotus/lotus.cxx',
+  'source/filter/lotus/memory.cxx',
+  'source/filter/lotus/op.cxx',
+  'source/filter/lotus/optab.cxx',
+  'source/filter/lotus/tool.cxx',
+  'source/filter/qpro/qpro.cxx',
+  'source/filter/qpro/qproform.cxx',
+  'source/filter/qpro/qprostyle.cxx',
+  'source/filter/rtf/eeimpars.cxx',
+  'source/filter/rtf/expbase.cxx',
+  'source/filter/rtf/rtfexp.cxx',
+  'source/filter/rtf/rtfimp.cxx',
+  'source/filter/rtf/rtfparse.cxx',
+  'source/filter/xcl97/XclExpChangeTrack.cxx',
+  'source/filter/xcl97/XclImpChangeTrack.cxx',
+  'source/filter/xcl97/xcl97esc.cxx',
+  'source/filter/xcl97/xcl97rec.cxx',
+  'source/filter/oox/excelfilter.cxx',
+  'source/filter/oox/addressconverter.cxx',
+  'source/filter/oox/autofilterbuffer.cxx',
+  'source/filter/oox/autofiltercontext.cxx',
+  'source/filter/oox/biffhelper.cxx',
+  'source/filter/oox/chartsheetfragment.cxx',
+  'source/filter/oox/commentsbuffer.cxx',
+  'source/filter/oox/commentsfragment.cxx',
+  'source/filter/oox/condformatbuffer.cxx',
+  'source/filter/oox/condformatcontext.cxx',
+  'source/filter/oox/connectionsbuffer.cxx',
+  'source/filter/oox/connectionsfragment.cxx',
+  'source/filter/oox/defnamesbuffer.cxx',
+  'source/filter/oox/drawingbase.cxx',
+  'source/filter/oox/drawingfragment.cxx',
+  'source/filter/oox/excelchartconverter.cxx',
+  'source/filter/oox/excelhandlers.cxx',
+  'source/filter/oox/excelvbaproject.cxx',
+  'source/filter/oox/externallinkbuffer.cxx',
+  'source/filter/oox/externallinkfragment.cxx',
+  'source/filter/oox/extlstcontext.cxx',
+  'source/filter/oox/formulabase.cxx',
+  'source/filter/oox/formulabuffer.cxx',
+  'source/filter/oox/formulaparser.cxx',
+  'source/filter/oox/numberformatsbuffer.cxx',
+  'source/filter/oox/ooxformulaparser.cxx',
+  'source/filter/oox/pagesettings.cxx',
+  'source/filter/oox/pivotcachebuffer.cxx',
+  'source/filter/oox/pivotcachefragment.cxx',
+  'source/filter/oox/pivottablebuffer.cxx',
+  'source/filter/oox/pivottablefragment.cxx',
+  'source/filter/oox/querytablebuffer.cxx',
+  'source/filter/oox/querytablefragment.cxx',
+  'source/filter/oox/revisionfragment.cxx',
+  'source/filter/oox/richstringcontext.cxx',
+  'source/filter/oox/richstring.cxx',
+  'source/filter/oox/scenariobuffer.cxx',
+  'source/filter/oox/scenariocontext.cxx',
+  'source/filter/oox/sharedstringsbuffer.cxx',
+  'source/filter/oox/sharedstringsfragment.cxx',
+  'source/filter/oox/sheetdatabuffer.cxx',
+  'source/filter/oox/sheetdatacontext.cxx',
+  'source/filter/oox/stylesbuffer.cxx',
+  'source/filter/oox/stylesfragment.cxx',
+  'source/filter/oox/tablebuffer.cxx',
+  'source/filter/oox/tablecolumnsbuffer.cxx',
+  'source/filter/oox/tablecolumnscontext.cxx',
+  'source/filter/oox/tablefragment.cxx',
+  'source/filter/oox/themebuffer.cxx',
+  'source/filter/oox/unitconverter.cxx',
+  'source/filter/oox/viewsettings.cxx',
+  'source/filter/oox/workbookfragment.cxx',
+  'source/filter/oox/workbookhelper.cxx',
+  'source/filter/oox/workbooksettings.cxx',
+  'source/filter/oox/worksheetbuffer.cxx',
+  'source/filter/oox/worksheetfragment.cxx',
+  'source/filter/oox/worksheethelper.cxx',
+  'source/filter/oox/worksheetsettings.cxx',
+  # ?????
+  'source/filter/orcus/interface.cxx',
+  'source/filter/orcus/orcusfiltersimpl.cxx',
+  'source/filter/orcus/xmlcontext.cxx',
+  'source/filter/orcus/filterdetect.cxx',
+
+  udk_fake_h, off_fake_h,
+  cpp_args: ['-DLIBO_INTERNAL_ONLY'],
+  include_directories: [
+    'inc',
+    main_inc,
+    offapi_inc,
+    '../oox',
+    setup_inc,
+    'source/filter/inc',
+    'source/ui/inc',
+    udkh_inc,
+  ],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    drawinglayer_lib,
+    editeng_lib,
+    for_lib,
+    msfilter_lib,
+    oox_lib,
+    sal_lib,
+    salhelper_lib,
+    sax_lib,
+    sb_lib,
+    sc_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svx_lib,
+    svxcore_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+    i18nlangtag_lib,
+  ],
+  dependencies: [orcus_dep, broken_mdds_dep],
+  install: true,
+)
 
 vbaobj_lib = shared_library('vbaobjlo',
   'source/ui/vba/excelvbahelper.cxx',
commit 555f57b914c99c06a9e54efb34e2518357bf0552
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Sat Feb 22 23:10:22 2020 +0000
Commit:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
CommitDate: Sat Mar 14 23:33:27 2020 +0000

    Fix missing Calc officecfg headers
    
    Change-Id: Ief62466eeeb7b4224cf4c1958df55b3a730aa2d4

diff --git a/sc/meson.build b/sc/meson.build
index df2ccbffb83a..5c004c90f776 100644
--- a/sc/meson.build
+++ b/sc/meson.build
@@ -606,6 +606,7 @@ sc_lib = shared_library('sclo',
   'source/core/tool/formulalogger.cxx',
   scslots_hxx,
   udk_fake_h, off_fake_h, oovba_fake_h,
+  calc_hxx, common_hxx,
   cpp_args: ['-DSC_DLLIMPLEMENTATION',
              '-DSC_INFO_OSVERSION="linux"',
              '-DLIBO_INTERNAL_ONLY'],
@@ -614,6 +615,7 @@ sc_lib = shared_library('sclo',
     main_inc,
     offapi_inc,
     oovbaapi_inc,
+    setup_inc,
     'source/core/inc',
     'source/filter/inc',
     'source/ui/inc',
@@ -717,12 +719,13 @@ scui_lib = shared_library('scuilo',
   'source/ui/pagedlg/tphf.cxx',
   'source/ui/pagedlg/tptable.cxx',
   'source/ui/styleui/styledlg.cxx',
-  udk_fake_h, off_fake_h,
+  udk_fake_h, off_fake_h, calc_hxx,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
   include_directories: [
     'inc',
     main_inc,
     offapi_inc,
+    setup_inc,
     'source/ui/inc',
     udkh_inc,
   ],
commit bd888a2cfb6feb2e7f6d0bce52b92b70dc2b1723
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Sat Feb 22 23:08:19 2020 +0000
Commit:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
CommitDate: Sat Mar 14 23:32:33 2020 +0000

    Build kf55 VCL backend
    
    Change-Id: Ie1ba0024258dc9cbbb941527cd4374c2e2b5b24e

diff --git a/meson.build b/meson.build
index 8a41962db1ff..3890bf051652 100644
--- a/meson.build
+++ b/meson.build
@@ -167,6 +167,11 @@ qt5 = import('qt5')
 qt5_dep = dependency('qt5', modules: ['Core', 'Gui', 'Widgets'])
 qt5_x11_dep = dependency('qt5', modules: ['X11Extras'])
 
+kf5_kio_filewidgets_dep = dependency('KF5KIO', modules: ['KF5::KIOFileWidgets'])
+kf5_i18n_dep = dependency('KF5I18n')
+kf5_config_dep = dependency('KF5KIO', modules: 'KF5::ConfigCore')
+kf5_winsys_dep = dependency('KF5WindowSystem')
+
 # The version in Ubuntu eoan is too old.
 #mdds_dep = dependency('mdds-1.5')
 mdds_dep = declare_dependency(include_directories: 'mdds')
diff --git a/vcl/meson.build b/vcl/meson.build
index 1c44908e820f..da938ede5110 100644
--- a/vcl/meson.build
+++ b/vcl/meson.build
@@ -740,3 +740,48 @@ vclplug_qt5 = shared_library('vclplug_qt5lo',
   install : true,
 )
 
+vclplug_kf5_moc = qt5.preprocess(
+  moc_headers : [
+    'unx/kf5/KF5FilePicker.hxx'
+  ],
+  include_directories: [ 'inc/qt5', 'unx/kf5' ],
+  dependencies: [ qt5_dep ]
+)
+
+vclplug_kf5 = shared_library('vclplug_kf5lo',
+  'unx/kf5/KF5FilePicker.cxx',
+  'unx/kf5/KF5SalFrame.cxx',
+  'unx/kf5/KF5SalInstance.cxx',
+  vclplug_kf5_moc,
+  udk_fake_h, off_fake_h, common_hxx,
+  include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'inc/qt5', setup_inc],
+  cpp_args: ['-DLIBO_INTERNAL_ONLY',
+             '-DVCLPLUG_KF5_IMPLEMENTATION',
+             '-Wno-deprecated-declarations'],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    sal_lib,
+    salhelper_lib,
+    sot_lib,
+    svl_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+    vclplug_qt5,
+  ],
+  dependencies: [
+    cairo_dep,
+    harfbuzz_dep,
+    kf5_config_dep,
+    kf5_i18n_dep,
+    kf5_kio_filewidgets_dep,
+    qt5_dep,
+  ],
+  install : true,
+)
diff --git a/vcl/unx/kf5/KF5FilePicker.cxx b/vcl/unx/kf5/KF5FilePicker.cxx
index 0d95cd0be304..601f85816b1a 100644
--- a/vcl/unx/kf5/KF5FilePicker.cxx
+++ b/vcl/unx/kf5/KF5FilePicker.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "KF5FilePicker.hxx"
-#include <KF5FilePicker.moc>
 
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <cppuhelper/supportsservice.hxx>
commit a372b6ad1cb8c63fc8b27a3042aad0e50cb6b95e
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Sat Feb 22 23:08:03 2020 +0000
Commit:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
CommitDate: Sat Mar 14 23:32:30 2020 +0000

    Build qt5 VCL backend
    
    Change-Id: Id29470e1c31e34b772832ce40bd390e708122c8e

diff --git a/meson.build b/meson.build
index 1a6f07f6f463..8a41962db1ff 100644
--- a/meson.build
+++ b/meson.build
@@ -163,6 +163,10 @@ hyphen_dep = cpp.find_library('hyphen')
 mythes_dep = dependency('mythes')
 libexttextcat_dep = dependency('libexttextcat')
 
+qt5 = import('qt5')
+qt5_dep = dependency('qt5', modules: ['Core', 'Gui', 'Widgets'])
+qt5_x11_dep = dependency('qt5', modules: ['X11Extras'])
+
 # The version in Ubuntu eoan is too old.
 #mdds_dep = dependency('mdds-1.5')
 mdds_dep = declare_dependency(include_directories: 'mdds')
diff --git a/vcl/meson.build b/vcl/meson.build
index dcbdb95d7747..1c44908e820f 100644
--- a/vcl/meson.build
+++ b/vcl/meson.build
@@ -657,3 +657,86 @@ desktopdetector_lib = shared_library('desktopdetector',
   dependencies: [x11_dep],
   install: true,
 )
+
+vclplug_qt5_moc = qt5.preprocess(
+  moc_headers : [
+  'inc/qt5/Qt5AccessibleWidget.hxx',
+  'inc/qt5/Qt5Clipboard.hxx',
+  'inc/qt5/Qt5FilePicker.hxx',
+  'inc/qt5/Qt5Frame.hxx',
+  'inc/qt5/Qt5Instance.hxx',
+  'inc/qt5/Qt5MainWindow.hxx',
+  'inc/qt5/Qt5Menu.hxx',
+  'inc/qt5/Qt5Object.hxx',
+  'inc/qt5/Qt5Timer.hxx',
+  'inc/qt5/Qt5Widget.hxx',
+  'inc/qt5/Qt5XAccessible.hxx'
+  ],
+  include_directories: 'inc/qt5',
+  dependencies: [ qt5_dep ],
+)
+
+vclplug_qt5 = shared_library('vclplug_qt5lo',
+  'qt5/Qt5AccessibleEventListener.cxx',
+  'qt5/Qt5AccessibleWidget.cxx',
+  'qt5/Qt5Bitmap.cxx',
+  'qt5/Qt5Clipboard.cxx',
+  'qt5/Qt5Data.cxx',
+  'qt5/Qt5DragAndDrop.cxx',
+  'qt5/Qt5FilePicker.cxx',
+  'qt5/Qt5Font.cxx',
+  'qt5/Qt5FontFace.cxx',
+  'qt5/Qt5Frame.cxx',
+  'qt5/Qt5Graphics.cxx',
+  'qt5/Qt5Graphics_Controls.cxx',
+  'qt5/Qt5Graphics_GDI.cxx',
+  'qt5/Qt5Graphics_Text.cxx',
+  'qt5/Qt5Instance.cxx',
+  'qt5/Qt5Instance_Print.cxx',
+  'qt5/Qt5MainWindow.cxx',
+  'qt5/Qt5Menu.cxx',
+  'qt5/Qt5Object.cxx',
+  'qt5/Qt5OpenGLContext.cxx',
+  'qt5/Qt5Painter.cxx',
+  'qt5/Qt5Printer.cxx',
+  'qt5/Qt5SvpGraphics.cxx',
+  'qt5/Qt5SvpSurface.cxx',
+  'qt5/Qt5System.cxx',
+  'qt5/Qt5Timer.cxx',
+  'qt5/Qt5Tools.cxx',
+  'qt5/Qt5Transferable.cxx',
+  'qt5/Qt5VirtualDevice.cxx',
+  'qt5/Qt5Widget.cxx',
+  'qt5/Qt5XAccessible.cxx',
+  vclplug_qt5_moc,
+  udk_fake_h, off_fake_h, common_hxx,
+  include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'inc/qt5', setup_inc],
+  cpp_args: ['-DLIBO_INTERNAL_ONLY',
+             '-DVCLPLUG_QT5_IMPLEMENTATION',
+             '-Wno-deprecated-declarations'],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    sal_lib,
+    salhelper_lib,
+    sot_lib,
+    svl_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
+  dependencies: [
+    cairo_dep,
+    epoxy_dep,
+    harfbuzz_dep,
+    qt5_dep,
+    qt5_x11_dep,
+  ],
+  install : true,
+)
+
diff --git a/vcl/qt5/Qt5AccessibleWidget.cxx b/vcl/qt5/Qt5AccessibleWidget.cxx
index dd062e369c46..e14eae593e19 100644
--- a/vcl/qt5/Qt5AccessibleWidget.cxx
+++ b/vcl/qt5/Qt5AccessibleWidget.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <Qt5AccessibleWidget.hxx>
-#include <Qt5AccessibleWidget.moc>
 
 #include <QtGui/QAccessibleInterface>
 
diff --git a/vcl/qt5/Qt5Clipboard.cxx b/vcl/qt5/Qt5Clipboard.cxx
index cadedbfd327e..6bd9ef2b7664 100644
--- a/vcl/qt5/Qt5Clipboard.cxx
+++ b/vcl/qt5/Qt5Clipboard.cxx
@@ -9,7 +9,6 @@
  */
 
 #include <Qt5Clipboard.hxx>
-#include <Qt5Clipboard.moc>
 
 #include <cppuhelper/supportsservice.hxx>
 #include <sal/log.hxx>
diff --git a/vcl/qt5/Qt5FilePicker.cxx b/vcl/qt5/Qt5FilePicker.cxx
index d37c28b33c11..386e890c3ef5 100644
--- a/vcl/qt5/Qt5FilePicker.cxx
+++ b/vcl/qt5/Qt5FilePicker.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <Qt5FilePicker.hxx>
-#include <Qt5FilePicker.moc>
 
 #include <Qt5Frame.hxx>
 #include <Qt5Tools.hxx>
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 905e542a65b0..b56933d3d2a3 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <Qt5Frame.hxx>
-#include <Qt5Frame.moc>
 
 #include <Qt5Data.hxx>
 #include <Qt5DragAndDrop.hxx>
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 1a0f10864e41..970373ff86bc 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <Qt5Instance.hxx>
-#include <Qt5Instance.moc>
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
diff --git a/vcl/qt5/Qt5MainWindow.cxx b/vcl/qt5/Qt5MainWindow.cxx
index a2a0d6cea86f..79d72488b70f 100644
--- a/vcl/qt5/Qt5MainWindow.cxx
+++ b/vcl/qt5/Qt5MainWindow.cxx
@@ -9,7 +9,6 @@
  */
 
 #include <Qt5MainWindow.hxx>
-#include <Qt5MainWindow.moc>
 #include <Qt5AccessibleWidget.hxx>
 
 #include <QtGui/QAccessible>
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index b2e752faedaa..e6f0fde24658 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -8,7 +8,6 @@
  */
 
 #include <Qt5Menu.hxx>
-#include <Qt5Menu.moc>
 
 #include <Qt5Frame.hxx>
 #include <Qt5Instance.hxx>
diff --git a/vcl/qt5/Qt5Object.cxx b/vcl/qt5/Qt5Object.cxx
index 5bbfef5a5870..3bef055747ca 100644
--- a/vcl/qt5/Qt5Object.cxx
+++ b/vcl/qt5/Qt5Object.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <Qt5Object.hxx>
-#include <Qt5Object.moc>
 
 #include <Qt5Frame.hxx>
 #include <Qt5Widget.hxx>
diff --git a/vcl/qt5/Qt5Timer.cxx b/vcl/qt5/Qt5Timer.cxx
index bbc2800e868d..c7d4d718a773 100644
--- a/vcl/qt5/Qt5Timer.cxx
+++ b/vcl/qt5/Qt5Timer.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <Qt5Timer.hxx>
-#include <Qt5Timer.moc>
 
 #include <QtWidgets/QApplication>
 #include <QtCore/QThread>
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 70f480364f57..477fbc0ccaa0 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <Qt5Widget.hxx>
-#include <Qt5Widget.moc>
 
 #include <Qt5Frame.hxx>
 #include <Qt5Graphics.hxx>
diff --git a/vcl/qt5/Qt5XAccessible.cxx b/vcl/qt5/Qt5XAccessible.cxx
index e9f0804d5061..89cfca55a89b 100644
--- a/vcl/qt5/Qt5XAccessible.cxx
+++ b/vcl/qt5/Qt5XAccessible.cxx
@@ -8,7 +8,6 @@
  */
 
 #include <Qt5XAccessible.hxx>
-#include <Qt5XAccessible.moc>
 
 #include <Qt5Frame.hxx>
 #include <Qt5Tools.hxx>
commit e54b30b2684e542927169e6b8de7fe01b9152c01
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Sat Feb 22 22:38:26 2020 +0000
Commit:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
CommitDate: Sat Mar 14 23:31:16 2020 +0000

    Add (manual) instdir support
    
    Change-Id: Ie9f22abf0fb6432573b7524fdebb48548f4bb04c

diff --git a/codemaker/meson.build b/codemaker/meson.build
index 6c5c750786d7..2eae937c1749 100644
--- a/codemaker/meson.build
+++ b/codemaker/meson.build
@@ -21,5 +21,6 @@ cppumaker_exe = executable('cppumaker',
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
   link_with: [codemaker_st_lib, unoidl_lib, salhelper_lib, sal_lib],
   install: true,
+  install_dir: 'sdk/bin',
 )
 
diff --git a/external/clew/meson.build b/external/clew/meson.build
index 4e41bb01eb2a..653144a07e47 100644
--- a/external/clew/meson.build
+++ b/external/clew/meson.build
@@ -2,6 +2,7 @@ clew_lib = shared_library('clewlo',
   'source/clew.c',
   include_directories: ['source/include'],
   dependencies: [dl_dep],
+  install: true,
 )
 
 clew_dep = declare_dependency(link_with: clew_lib,
diff --git a/filter/meson.build b/filter/meson.build
index cefe9fac3b6c..15276f77ba24 100644
--- a/filter/meson.build
+++ b/filter/meson.build
@@ -78,4 +78,4 @@ msfilter_lib = shared_library('msfilterlo',
   ],
   dependencies: [],
   install: true,
-)
\ No newline at end of file
+)
diff --git a/idlc/meson.build b/idlc/meson.build
index 5accbd525607..9006c29736eb 100644
--- a/idlc/meson.build
+++ b/idlc/meson.build
@@ -35,4 +35,5 @@ idlc = executable('idlc',
              '-DUCPP="file:///usr/bin/ucpp"'],
   link_with: [reg_lib, sal_lib],
   install: true,
+  install_dir: 'sdk/bin',
 )
diff --git a/meson.build b/meson.build
index 08590e8f1e50..1a6f07f6f463 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,12 @@
 project('libreoffice', 'c', 'cpp',
   version: '1.2.3',
-  default_options: ['cpp_std=c++17'])
+  default_options: [
+    'cpp_std=c++17',
+    'prefix=' + meson.source_root() + '/instdir',
+    'bindir=program',
+    'libdir=program',
+  ]
+)
 
 varr = meson.project_version().split('.')
 major_version = varr[0]
diff --git a/sw/meson.build b/sw/meson.build
index d031ffdc1be9..41bae18a6992 100644
--- a/sw/meson.build
+++ b/sw/meson.build
@@ -881,7 +881,6 @@ swui_lib = shared_library('swuilo',
   install: true,
 )
 
-
 msword_lib = shared_library('mswordlo',
   'source/filter/docx/swdocxreader.cxx',
   'source/filter/rtf/swparrtf.cxx',
@@ -1050,6 +1049,5 @@ vbaswobj_lib = shared_library('vbaswobjlo',
     vcl_lib
   ],
   dependencies: [libxml_dep],
-
   install: true,
 )
commit 4ca4079ae2ef803d4111d8f771aa9d660ae188f1
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Sat Feb 22 22:45:16 2020 +0000
Commit:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
CommitDate: Sat Mar 14 23:30:14 2020 +0000

    Break some long lines and sort dependencies
    
    ... so it'll be easier to track changes in the future.
    
    Change-Id: I42eda79d585b6763953d531601e37a37848c5ef8

diff --git a/basic/meson.build b/basic/meson.build
index 44d21ed3594f..8259f564713a 100644
--- a/basic/meson.build
+++ b/basic/meson.build
@@ -77,6 +77,20 @@ sb_lib = shared_library('sblo',
   cpp_args: ['-DBASIC_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, oovbaapi_inc, 'source/inc', 'inc', setup_inc],
-  link_with: [comphelper_lib, cppuhelper_lib, cppu_lib, salhelper_lib, sal_lib, i18nlangtag_lib, sot_lib, svl_lib, svt_lib, tl_lib, utl_lib, vcl_lib, xmlscript_lib],
+  link_with: [
+    comphelper_lib,
+    cppuhelper_lib,
+    cppu_lib,
+    salhelper_lib,
+    sal_lib,
+    i18nlangtag_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    tl_lib,
+    utl_lib,
+    vcl_lib,
+    xmlscript_lib,
+  ],
   install: true,
 )
diff --git a/connectivity/meson.build b/connectivity/meson.build
index 5832f178fba5..39198c0171b0 100644
--- a/connectivity/meson.build
+++ b/connectivity/meson.build
@@ -86,7 +86,18 @@ dbtools_lib = shared_library('dbtoolslo',
              '-DBOOST_SPIRIT_USE_OLD_NAMESPACE',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/inc'],
-  link_with: [cppuhelper_lib, cppu_lib, salhelper_lib, sal_lib, utl_lib, tl_lib, comphelper_lib, i18nlangtag_lib, svt_lib, vcl_lib],
+  link_with: [
+    cppuhelper_lib,
+    cppu_lib,
+    salhelper_lib,
+    sal_lib,
+    utl_lib,
+    tl_lib,
+    comphelper_lib,
+    i18nlangtag_lib,
+    svt_lib,
+    vcl_lib,
+  ],
   dependencies: [],
   install: true,
 )
diff --git a/cppcanvas/meson.build b/cppcanvas/meson.build
index e2dc75c0bd7e..077e64758fb7 100644
--- a/cppcanvas/meson.build
+++ b/cppcanvas/meson.build
@@ -24,6 +24,16 @@ cppcanvas_lib = shared_library('cppcanvaslo',
   cpp_args: ['-DCPPCANVAS_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'source/inc'],
-  link_with: [basegfx_lib, canvastools_lib, vcl_lib, svt_lib, tl_lib, cppu_lib, cppuhelper_lib, i18nlangtag_lib, sal_lib],
+  link_with: [
+    basegfx_lib,
+    canvastools_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    sal_lib,
+    svt_lib,
+    tl_lib,
+    vcl_lib,
+  ],
   install: true,
 )
diff --git a/cppuhelper/meson.build b/cppuhelper/meson.build
index 8de475f9ae5a..e532350e31df 100644
--- a/cppuhelper/meson.build
+++ b/cppuhelper/meson.build
@@ -34,7 +34,15 @@ cppuhelper_lib = shared_library('cppuhelperlo',
   udk_fake_h, off_fake_h, cppuhelper_fake_h,
   include_directories: [main_inc, udkh_inc, offapi_inc, cpphelper_uno_inc],
   cpp_args: ['-DCPPUHELPER_DLLIMPLEMENTATION', '-DLIBO_INTERNAL_ONLY'],
-  link_with: [temp_hack, cppu_lib, reg_lib, salhelper_lib, sal_lib, unoidl_lib, xmlreader_lib],
+  link_with: [
+    cppu_lib,
+    reg_lib,
+    sal_lib,
+    salhelper_lib,
+    temp_hack,
+    unoidl_lib,
+    xmlreader_lib
+  ],
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
diff --git a/cui/meson.build b/cui/meson.build
index 77bfc4ebcad1..88a09977c16d 100644
--- a/cui/meson.build
+++ b/cui/meson.build
@@ -135,7 +135,8 @@ cui_lib = shared_library('cuilo',
   cpp_args: ['-DCUI_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/inc', setup_inc],
-  link_with: [avmedia_lib,
+  link_with: [
+    avmedia_lib,
     basegfx_lib,
     comphelper_lib,
     cppu_lib,
@@ -153,13 +154,13 @@ cui_lib = shared_library('cuilo',
     sot_lib,
     svl_lib,
     svt_lib,
-    svxcore_lib,
     svx_lib,
+    svxcore_lib,
     tk_lib,
     tl_lib,
     ucbhelper_lib,
     utl_lib,
-    vcl_lib
+    vcl_lib,
   ],
   dependencies: [libxml_dep, icuuc_dep, qrcodegen_dep],
   install: true,
diff --git a/drawinglayer/meson.build b/drawinglayer/meson.build
index a7e7605c2d8e..47443e444d6e 100644
--- a/drawinglayer/meson.build
+++ b/drawinglayer/meson.build
@@ -138,7 +138,20 @@ drawinglayer_lib = shared_library('drawinglayerlo',
   cpp_args: ['-DDRAWINGLAYER_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc'],
-  link_with: [basegfx_lib, comphelper_lib, i18nlangtag_lib, cppuhelper_lib, cppu_lib, tl_lib, svl_lib, svt_lib, vcl_lib, salhelper_lib, tk_lib, sal_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    i18nlangtag_lib,
+    cppuhelper_lib,
+    cppu_lib,
+    tl_lib,
+    svl_lib,
+    svt_lib,
+    vcl_lib,
+    salhelper_lib,
+    tk_lib,
+    sal_lib
+  ],
   dependencies: [libxml_dep],
   install: true,
 )
diff --git a/editeng/meson.build b/editeng/meson.build
index 64ff3d9f8466..14dfb706c673 100644
--- a/editeng/meson.build
+++ b/editeng/meson.build
@@ -96,7 +96,28 @@ editeng_lib = shared_library('editenglo',
   cpp_args: ['-DTOOLS_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc'],
-  link_with: [xo_lib, basegfx_lib, lng_lib, svt_lib, tk_lib, vcl_lib, svl_lib, sot_lib, sfx_lib, utl_lib, tl_lib, comphelper_lib, ucbhelper_lib, cppuhelper_lib, cppu_lib, sal_lib, salhelper_lib, sax_lib, i18nlangtag_lib, i18nutil_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    lng_lib,
+    sal_lib,
+    salhelper_lib,
+    sax_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+    xo_lib,
+  ],
   dependencies: [libxml_dep, icuuc_dep],
   install: true,
 )
diff --git a/filter/meson.build b/filter/meson.build
index 4b0e579e8428..cefe9fac3b6c 100644
--- a/filter/meson.build
+++ b/filter/meson.build
@@ -55,7 +55,27 @@ msfilter_lib = shared_library('msfilterlo',
   cpp_args: ['-DLIBO_INTERNAL_ONLY',
              '-DMSFILTER_DLLIMPLEMENTATION'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', setup_inc],
-  link_with: [svxcore_lib, editeng_lib, sfx_lib, xo_lib, sb_lib, salhelper_lib, svt_lib, tk_lib, vcl_lib, svl_lib, sot_lib, xmlscript_lib, utl_lib, tl_lib, comphelper_lib, basegfx_lib, cppuhelper_lib, cppu_lib, sal_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    editeng_lib,
+    sal_lib,
+    salhelper_lib,
+    sb_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svxcore_lib,
+    tk_lib,
+    tl_lib,
+    utl_lib,
+    vcl_lib,
+    xmlscript_lib,
+    xo_lib,
+  ],
   dependencies: [],
   install: true,
 )
\ No newline at end of file
diff --git a/framework/meson.build b/framework/meson.build
index 62ea0c81538f..92dc4097eec2 100644
--- a/framework/meson.build
+++ b/framework/meson.build
@@ -13,7 +13,19 @@ fwi_lib = shared_library('fwilo',
   cpp_args: ['-DFWI_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'source/inc', 'inc'],
-  link_with: [i18nlangtag_lib, cppuhelper_lib, cppu_lib, comphelper_lib, vcl_lib, svl_lib, svt_lib, tl_lib, utl_lib, salhelper_lib, sal_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    sal_lib,
+    salhelper_lib,
+    svl_lib,
+    svt_lib,
+    tl_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   install: true,
 )
 
@@ -48,7 +60,19 @@ fwe_lib = shared_library('fwelo',
   cpp_args: ['-DFWE_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'source/inc', 'inc'],
-  link_with: [cppuhelper_lib, fwi_lib, cppu_lib, comphelper_lib, vcl_lib, svl_lib, svt_lib, tl_lib, utl_lib, salhelper_lib, sal_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    fwi_lib,
+    sal_lib,
+    salhelper_lib,
+    svl_lib,
+    svt_lib,
+    tl_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   install: true,
 )
 
@@ -76,7 +100,22 @@ fwl_lib = shared_library('fwllo',
   cpp_args: ['-DFWL_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'source/inc', 'inc', setup_inc],
-  link_with: [fwe_lib, fwi_lib, cppuhelper_lib, i18nlangtag_lib, cppu_lib, comphelper_lib, svt_lib, svl_lib, svt_lib, tk_lib, tl_lib, utl_lib, vcl_lib, sal_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    fwe_lib,
+    fwi_lib,
+    i18nlangtag_lib,
+    sal_lib,
+    svl_lib,
+    svt_lib,
+    svt_lib,
+    tk_lib,
+    tl_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   install: true,
 )
 
@@ -89,7 +128,14 @@ fwm_lib = shared_library('fwmlo',
   cpp_args: ['-DFWM_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'source/inc', 'inc', setup_inc],
-  link_with: [comphelper_lib, fwi_lib, cppuhelper_lib, cppu_lib, vcl_lib, sal_lib],
+  link_with: [
+    comphelper_lib,
+    fwi_lib,
+    cppuhelper_lib,
+    cppu_lib,
+    vcl_lib,
+    sal_lib,
+  ],
   install: true,
 )
 
@@ -212,6 +258,22 @@ fwk_lib = shared_library('fwklo',
   cpp_args: ['-DFWK_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'source/inc', 'inc', setup_inc],
-  link_with: [comphelper_lib, i18nlangtag_lib, cppuhelper_lib, cppu_lib, svt_lib, svl_lib, tk_lib, tl_lib, vcl_lib, ucbhelper_lib, utl_lib, fwe_lib, fwi_lib, salhelper_lib, sal_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    fwe_lib,
+    fwi_lib,
+    i18nlangtag_lib,
+    sal_lib,
+    salhelper_lib,
+    svl_lib,
+    svt_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   install: true,
 )
diff --git a/linguistic/meson.build b/linguistic/meson.build
index 2ded8af471ce..1d0fa10d6100 100644
--- a/linguistic/meson.build
+++ b/linguistic/meson.build
@@ -22,7 +22,20 @@ lng_lib = shared_library('lnglo',
   cpp_args: ['-DLNG_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc'],
-  link_with: [comphelper_lib, cppuhelper_lib, cppu_lib, i18nlangtag_lib, sal_lib, sax_lib, svl_lib, tl_lib, ucbhelper_lib, utl_lib, vcl_lib, xo_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    sal_lib,
+    sax_lib,
+    svl_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+    xo_lib,
+  ],
   dependencies: [icuuc_dep],
   install: true,
 )
diff --git a/sal/meson.build b/sal/meson.build
index 308e551b59dc..61ff8f6136ee 100644
--- a/sal/meson.build
+++ b/sal/meson.build
@@ -116,7 +116,11 @@ sal_lib = shared_library('sallo',
              '-DLIBO_INTERNAL_ONLY',
              '-DSAL_DLLIMPLEMENTATION'],
   link_args: system_link_args,
-  dependencies: [thread_dep, osx_frameworks_dep, dl_dep],
+  dependencies: [
+    dl_dep,
+    osx_frameworks_dep,
+    thread_dep,
+  ],
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
diff --git a/sc/meson.build b/sc/meson.build
index 895fdf3a9aa3..df2ccbffb83a 100644
--- a/sc/meson.build
+++ b/sc/meson.build
@@ -609,8 +609,18 @@ sc_lib = shared_library('sclo',
   cpp_args: ['-DSC_DLLIMPLEMENTATION',
              '-DSC_INFO_OSVERSION="linux"',
              '-DLIBO_INTERNAL_ONLY'],
-  include_directories: [main_inc, udkh_inc, offapi_inc, oovbaapi_inc, 'inc', 'source/core/inc', 'source/ui/inc', 'source/filter/inc'],
-  link_with: [avmedia_lib,
+  include_directories: [
+    'inc',
+    main_inc,
+    offapi_inc,
+    oovbaapi_inc,
+    'source/core/inc',
+    'source/filter/inc',
+    'source/ui/inc',
+    udkh_inc,
+  ],
+  link_with: [
+    avmedia_lib,
     basegfx_lib,
     comphelper_lib,
     cppu_lib,
@@ -639,8 +649,14 @@ sc_lib = shared_library('sclo',
     vbahelper_lib,
     vcl_lib,
     xo_lib,
-    ],
-  dependencies: [libxml_dep, icuuc_dep, icu18_dep, broken_mdds_dep, orcus_dep],
+  ],
+  dependencies: [
+    libxml_dep,
+    icuuc_dep,
+    icu18_dep,
+    broken_mdds_dep,
+    orcus_dep,
+  ], 
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
@@ -703,7 +719,13 @@ scui_lib = shared_library('scuilo',
   'source/ui/styleui/styledlg.cxx',
   udk_fake_h, off_fake_h,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
-  include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/ui/inc'],
+  include_directories: [
+    'inc',
+    main_inc,
+    offapi_inc,
+    'source/ui/inc',
+    udkh_inc,
+  ],
   link_with: [
     comphelper_lib,
     cppu_lib,
diff --git a/sd/meson.build b/sd/meson.build
index 4244feabf932..31e75c1a6775 100644
--- a/sd/meson.build
+++ b/sd/meson.build
@@ -406,8 +406,36 @@ sd_lib = shared_library('sdlo',
              '-DLIBO_INTERNAL_ONLY',
              '-DSDUI_DLL_NAME="libsdui.so"'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/ui/inc', 'source/ui/slidesorter/inc', setup_inc, '../oox'],
-  link_with: [avmedia_lib, basegfx_lib, canvastools_lib, comphelper_lib, cppcanvas_lib, cppu_lib, cppuhelper_lib, drawinglayer_lib, editeng_lib, i18nlangtag_lib, i18nutil_lib, msfilter_lib, oox_lib, sal_lib, salhelper_lib, sax_lib, sb_lib, sfx_lib, sot_lib, svl_lib, svt_lib, svxcore_lib, svx_lib, tk_lib, tl_lib, ucbhelper_lib, utl_lib, vcl_lib,
-],
+  link_with: [
+    avmedia_lib,
+    basegfx_lib,
+    canvastools_lib,
+    comphelper_lib,
+    cppcanvas_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    drawinglayer_lib,
+    editeng_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    msfilter_lib,
+    oox_lib,
+    sal_lib,
+    salhelper_lib,
+    sax_lib,
+    sb_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svx_lib,
+    svxcore_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   dependencies: [libxml_dep],
   gnu_symbol_visibility: 'hidden',
   install: true,
@@ -446,7 +474,30 @@ sdui_lib = shared_library('sduilo',
   udk_fake_h, off_fake_h, impress_hxx,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/ui/inc', setup_inc],
-  link_with: [basegfx_lib, comphelper_lib, cppcanvas_lib, cppu_lib, cppuhelper_lib, editeng_lib, i18nlangtag_lib, fwl_lib, fwe_lib, sal_lib, salhelper_lib, sd_lib, sfx_lib, sot_lib, svl_lib, svt_lib, svxcore_lib, svx_lib, tl_lib, utl_lib, vcl_lib, cui_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppcanvas_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    cui_lib,
+    editeng_lib,
+    fwe_lib,
+    fwl_lib,
+    i18nlangtag_lib,
+    sal_lib,
+    salhelper_lib,
+    sd_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svx_lib,
+    svxcore_lib,
+    tl_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   dependencies: [],
   gnu_symbol_visibility: 'hidden',
   install: true,
@@ -472,7 +523,29 @@ sdfilt_lib = shared_library('sdfiltlo',
   udk_fake_h, off_fake_h,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/ui/inc', '../oox'],
-  link_with: [comphelper_lib, cppu_lib, cppuhelper_lib, editeng_lib, i18nlangtag_lib, i18nutil_lib, msfilter_lib, oox_lib, sal_lib, sax_lib, sd_lib, sfx_lib, sot_lib, svl_lib, svt_lib, svxcore_lib, tl_lib, ucbhelper_lib, utl_lib, vcl_lib, basegfx_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    editeng_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    msfilter_lib,
+    oox_lib,
+    sal_lib,
+    sax_lib,
+    sd_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svxcore_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   dependencies: [],
   gnu_symbol_visibility: 'hidden',
   install: true,
diff --git a/sfx2/meson.build b/sfx2/meson.build
index 1ae7afbcf0ae..1842d4bdc95f 100644
--- a/sfx2/meson.build
+++ b/sfx2/meson.build
@@ -247,7 +247,31 @@ sfx_lib = shared_library('sfxlo',
   cpp_args: ['-DSFX2_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/inc', setup_inc],
-  link_with: [comphelper_lib, basegfx_lib, cppuhelper_lib, cppu_lib, drawinglayer_lib, fwe_lib, i18nutil_lib, i18nlangtag_lib, salhelper_lib, sal_lib, sax_lib, sb_lib, sot_lib, svl_lib, svt_lib, tk_lib, tl_lib, ucbhelper_lib, utl_lib, vcl_lib],
-  dependencies: [orcus_dep, libxml_dep],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    drawinglayer_lib,
+    fwe_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    sal_lib,
+    salhelper_lib,
+    sax_lib,
+    sb_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
+  dependencies: [
+    libxml_dep,
+    orcus_dep,
+  ],
   install: true,
 )
diff --git a/svl/meson.build b/svl/meson.build
index 6ad6063b90bc..ed9e3d303b0f 100644
--- a/svl/meson.build
+++ b/svl/meson.build
@@ -80,7 +80,20 @@ svl_lib = shared_library('svllo',
   cpp_args: ['-DSVL_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, setup_inc, 'source/inc'],
-  link_with: [basegfx_lib, comphelper_lib, cppuhelper_lib, cppu_lib, i18nutil_lib, i18nlangtag_lib, sal_lib, sot_lib, jvmfwk_lib, tl_lib, ucbhelper_lib, utl_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    jvmfwk_lib,
+    sal_lib,
+    sot_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+  ],
   dependencies: [icuuc_dep, icu18_dep, libxml_dep, mdds_dep],
   gnu_symbol_visibility: 'hidden',
   install: true,
diff --git a/svtools/meson.build b/svtools/meson.build
index fc8b5aed0794..1d4307d4bb0f 100644
--- a/svtools/meson.build
+++ b/svtools/meson.build
@@ -119,6 +119,22 @@ svt_lib = shared_library('svtlo',
   cpp_args: ['-DSVT_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/inc', setup_inc],
-  link_with: [basegfx_lib, vcl_lib, i18nlangtag_lib, i18nutil_lib, utl_lib, cppuhelper_lib, cppu_lib, comphelper_lib, sot_lib, svl_lib, tk_lib, tl_lib, ucbhelper_lib, salhelper_lib, sal_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    sal_lib,
+    salhelper_lib,
+    sot_lib,
+    svl_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   install: true,
 )
diff --git a/svx/meson.build b/svx/meson.build
index a6e4de50023c..cbfa718fca28 100644
--- a/svx/meson.build
+++ b/svx/meson.build
@@ -382,7 +382,35 @@ svxcore_lib = shared_library('svxcorelo',
              '-DBOOST_SPIRIT_USE_OLD_NAMESPACE',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/inc', setup_inc],
-  link_with: [avmedia_lib, basegfx_lib, fwe_lib, sb_lib, comphelper_lib, cppuhelper_lib, cppu_lib, dbtools_lib, dbtools_lib, drawinglayer_lib, editeng_lib, i18nutil_lib, i18nlangtag_lib, lng_lib, sal_lib, salhelper_lib, sax_lib, sfx_lib, sot_lib, svl_lib, svt_lib, tk_lib, tl_lib, ucbhelper_lib, utl_lib, vcl_lib, xo_lib],
+  link_with: [
+    avmedia_lib,
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    dbtools_lib,
+    dbtools_lib,
+    drawinglayer_lib,
+    editeng_lib,
+    fwe_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    lng_lib,
+    sal_lib,
+    salhelper_lib,
+    sax_lib,
+    sb_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+    xo_lib
+  ],
   dependencies: [libxml_dep, icuuc_dep],
   install: true,
 )
@@ -566,7 +594,34 @@ svx_lib = shared_library('svxlo',
              '-DBOOST_SPIRIT_USE_OLD_NAMESPACE',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/inc', setup_inc],
-  link_with: [avmedia_lib, basegfx_lib, sb_lib, comphelper_lib, cppuhelper_lib, cppu_lib, dbtools_lib, drawinglayer_lib, editeng_lib, fwe_lib, i18nlangtag_lib, i18nutil_lib, sal_lib, salhelper_lib, sfx_lib, sot_lib, svl_lib, svt_lib, svxcore_lib, tk_lib, tl_lib, ucbhelper_lib, utl_lib, vcl_lib, xo_lib, xmlscript_lib],
+  link_with: [
+    avmedia_lib,
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    dbtools_lib,
+    drawinglayer_lib,
+    editeng_lib,
+    fwe_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    sal_lib,
+    salhelper_lib,
+    sb_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svxcore_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+    xmlscript_lib,
+    xo_lib,
+  ],
   dependencies: [icuuc_dep],
   install: true,
 )
diff --git a/sw/meson.build b/sw/meson.build
index 4ce84c92afa3..d031ffdc1be9 100644
--- a/sw/meson.build
+++ b/sw/meson.build
@@ -716,7 +716,38 @@ sw_lib = shared_library('swlo',
              '-DLIBO_INTERNAL_ONLY',
              '-DSWUI_DLL_NAME="libswui.so"'],
   include_directories: [main_inc, udkh_inc, offapi_inc, oovbaapi_inc, 'inc', 'source/core/inc', 'source/uibase/inc', 'source/filter/inc', setup_inc],
-  link_with: [avmedia_lib, basegfx_lib, comphelper_lib, cppuhelper_lib, cppu_lib, dbtools_lib, drawinglayer_lib, editeng_lib, i18nlangtag_lib, i18nutil_lib, lng_lib, msfilter_lib, salhelper_lib, sal_lib, sax_lib, sb_lib, sfx_lib, sot_lib, svl_lib, svt_lib, svxcore_lib, svx_lib, tk_lib, tl_lib, ucbhelper_lib, utl_lib, vbahelper_lib, vcl_lib, xmlreader_lib, xo_lib],
+  link_with: [
+    avmedia_lib,
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    dbtools_lib,
+    drawinglayer_lib,
+    editeng_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    lng_lib,
+    msfilter_lib,
+    sal_lib,
+    salhelper_lib,
+    sax_lib,
+    sb_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svx_lib,
+    svxcore_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vbahelper_lib,
+    vcl_lib,
+    xmlreader_lib,
+    xo_lib
+  ],
   dependencies: [icuuc_dep, libxml_dep],
   gnu_symbol_visibility: 'hidden',
   install: true,
@@ -820,7 +851,31 @@ swui_lib = shared_library('swuilo',
   udk_fake_h, off_fake_h, writer_hxx, compatibility_hxx,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/uibase/inc', 'source/ui/inc', setup_inc],
-  link_with: [comphelper_lib, cppuhelper_lib, cppu_lib, dbtools_lib, editeng_lib, i18nlangtag_lib, i18nutil_lib, msfilter_lib, sal_lib, salhelper_lib, sfx_lib, sot_lib, svl_lib, svt_lib, svx_lib, svxcore_lib, sw_lib, tk_lib, tl_lib, ucbhelper_lib, utl_lib, vcl_lib, drawinglayer_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    dbtools_lib,
+    drawinglayer_lib,
+    editeng_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    msfilter_lib,
+    sal_lib,
+    salhelper_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svx_lib,
+    svxcore_lib,
+    sw_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   dependencies: [],
   gnu_symbol_visibility: 'hidden',
   install: true,
@@ -869,7 +924,32 @@ msword_lib = shared_library('mswordlo',
   udk_fake_h, off_fake_h,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/filter/inc', '../oox'],
-  link_with: [basegfx_lib, comphelper_lib, cppuhelper_lib, cppu_lib, editeng_lib, i18nlangtag_lib, i18nutil_lib, msfilter_lib, sal_lib, sax_lib, sb_lib, oox_lib, sfx_lib, sot_lib, svl_lib, svt_lib, svx_lib, svxcore_lib, sw_lib, tk_lib, tl_lib, ucbhelper_lib, utl_lib, vcl_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    editeng_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    msfilter_lib,
+    oox_lib,
+    sal_lib,
+    sax_lib,
+    sb_lib,
+    sfx_lib,
+    sot_lib,
+    svl_lib,
+    svt_lib,
+    svx_lib,
+    svxcore_lib,
+    sw_lib,
+    tk_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   dependencies: [libxml_dep, icuuc_dep],
   install: true,
 )
@@ -949,7 +1029,26 @@ vbaswobj_lib = shared_library('vbaswobjlo',
   udk_fake_h, off_fake_h, oovba_fake_h,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, oovbaapi_inc, 'inc'],
-  link_with: [comphelper_lib, cppu_lib, cppuhelper_lib, editeng_lib, i18nlangtag_lib, sal_lib, sb_lib, sfx_lib, svl_lib, svt_lib, svx_lib, svxcore_lib, sw_lib, tk_lib, tl_lib, utl_lib, vbahelper_lib, vcl_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    editeng_lib,
+    i18nlangtag_lib,
+    sal_lib,
+    sb_lib,
+    sfx_lib,
+    svl_lib,
+    svt_lib,
+    svx_lib,
+    svxcore_lib,
+    sw_lib,
+    tk_lib,
+    tl_lib,
+    utl_lib,
+    vbahelper_lib,
+    vcl_lib
+  ],
   dependencies: [libxml_dep],
 
   install: true,
diff --git a/tools/meson.build b/tools/meson.build
index 34fc834ee7fe..2f94657b0980 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -50,7 +50,14 @@ tl_lib = shared_library('tllo',
   cpp_args: ['-DTOOLS_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc'],
-  link_with: [basegfx_lib, comphelper_lib, i18nlangtag_lib, cppu_lib, cppuhelper_lib, sal_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    sal_lib,
+  ],
   dependencies: [libxml_dep, zlib_dep],
   gnu_symbol_visibility: 'hidden',
   install: true,
diff --git a/ucbhelper/meson.build b/ucbhelper/meson.build
index dc7c35b39c52..98468e02ebd8 100644
--- a/ucbhelper/meson.build
+++ b/ucbhelper/meson.build
@@ -28,7 +28,12 @@ ucbhelper_lib = shared_library('ucbhelperlo',
   cpp_args: ['-DUCBHELPER_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'  ],
   include_directories: [main_inc, udkh_inc, offapi_inc],
-  link_with: [cppuhelper_lib, cppu_lib, salhelper_lib, sal_lib],
+  link_with: [
+    cppuhelper_lib,
+    cppu_lib,
+    salhelper_lib,
+    sal_lib,
+  ],
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
diff --git a/vbahelper/meson.build b/vbahelper/meson.build
index ca21f0959f0a..12d5db99cd13 100644
--- a/vbahelper/meson.build
+++ b/vbahelper/meson.build
@@ -28,7 +28,22 @@ vbahelper_lib = shared_library('vbahelperlo',
   cpp_args: ['-DVBAHELPER_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, oovbaapi_inc, 'inc'],
-  link_with: [comphelper_lib, cppuhelper_lib, cppu_lib, msfilter_lib, sal_lib, sb_lib, sfx_lib, svl_lib, svt_lib, svxcore_lib, tk_lib, tl_lib, utl_lib, vcl_lib],
+  link_with: [
+    comphelper_lib,
+    cppuhelper_lib,
+    cppu_lib,
+    msfilter_lib,
+    sal_lib,
+    sb_lib,
+    sfx_lib,
+    svl_lib,
+    svt_lib,
+    svxcore_lib,
+    tk_lib,
+    tl_lib,
+    utl_lib,
+    vcl_lib,
+  ], 
   dependencies: [],
   install: true,
 )
@@ -59,7 +74,22 @@ msforms_lib = shared_library('msformslo',
   udk_fake_h, off_fake_h, oovba_fake_h,
   include_directories: [main_inc, udkh_inc, offapi_inc, oovbaapi_inc, 'inc'],
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
-  link_with: [comphelper_lib, cppuhelper_lib, cppu_lib, sal_lib, sb_lib, sfx_lib, svl_lib, svt_lib, svx_lib, svxcore_lib, tk_lib, tl_lib, vbahelper_lib, vcl_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    sal_lib,
+    sb_lib,
+    sfx_lib,
+    svl_lib,
+    svt_lib,
+    svx_lib,
+    svxcore_lib,
+    tk_lib,
+    tl_lib,
+    vbahelper_lib,
+    vcl_lib,
+  ],
   dependencies: [],
   install: true,
 )
diff --git a/vcl/meson.build b/vcl/meson.build
index ce930f36028c..dcbdb95d7747 100644
--- a/vcl/meson.build
+++ b/vcl/meson.build
@@ -424,8 +424,41 @@ vcl_lib = shared_library('vcllo',
              '-DGLM_ENABLE_EXPERIMENTAL',
              '-DDESKTOP_DETECTOR_DLL_NAME="libdesktopdetector.so"',
              '-DTK_DLL_NAME="libtklo.so"'],
-  link_with: [svl_lib, tl_lib, utl_lib, sot_lib, ucbhelper_lib, basegfx_lib, comphelper_lib, cppuhelper_lib, i18nlangtag_lib, i18nutil_lib, cppu_lib, salhelper_lib, sal_lib, xmlreader_lib],
-  dependencies: [harfbuzz_dep, harfbuzz_icu_dep, fc_dep, glm_dep, cairo_dep, eot_dep, jpg_dep, png_dep, icuuc_dep, graphite_dep, dl_dep, lcms_dep, epoxy_dep, gio_dep, dbus_dep, xext_dep, x11_dep],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    sal_lib,
+    salhelper_lib,
+    sot_lib,
+    svl_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    xmlreader_lib,
+  ], 
+  dependencies: [
+    cairo_dep,
+    dbus_dep,
+    dl_dep,
+    eot_dep,
+    epoxy_dep,
+    fc_dep,
+    gio_dep,
+    glm_dep,
+    graphite_dep,
+    harfbuzz_dep,
+    harfbuzz_icu_dep,
+    icuuc_dep,
+    jpg_dep,
+    lcms_dep,
+    png_dep,
+    x11_dep,
+    xext_dep,
+  ], 
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
@@ -469,8 +502,28 @@ vclplug_gtk3 = shared_library('vclplug_gtk3lo',
   cpp_args: ['-DLIBO_INTERNAL_ONLY',
              '-DVCLPLUG_GTK_IMPLEMENTATION',
              '-Wno-deprecated-declarations'],
-  link_with: [vcl_lib, svl_lib, utl_lib, ucbhelper_lib, basegfx_lib, comphelper_lib, cppuhelper_lib, tl_lib, sot_lib, i18nlangtag_lib, i18nutil_lib, cppu_lib, sal_lib],
-  dependencies: [gtk3_dep, gtkprint_dep, epoxy_dep, dl_dep, x11_dep],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppuhelper_lib,
+    cppu_lib,
+    i18nlangtag_lib,
+    i18nutil_lib,
+    sal_lib,
+    sot_lib,
+    svl_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
+  ],
+  dependencies: [
+    dl_dep,
+    epoxy_dep,
+    gtk3_dep,
+    gtkprint_dep,
+    x11_dep,
+  ],
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
@@ -518,20 +571,34 @@ vclplug_gen = shared_library('vclplug_genlo',
              '-DLIBO_INTERNAL_ONLY',
              '-DUSE_RANDR'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc'],
-  link_with: [vcl_lib,
-    tl_lib,
-    utl_lib,
-    sot_lib,
-    ucbhelper_lib,
+  link_with: [
     basegfx_lib,
     comphelper_lib,
     cppuhelper_lib,
+    cppu_lib,
     i18nlangtag_lib,
     i18nutil_lib,
-    cppu_lib,
     sal_lib,
+    sot_lib,
+    svl_lib,
+    tl_lib,
+    ucbhelper_lib,
+    utl_lib,
+    vcl_lib,
   ],
-  dependencies: [harfbuzz_dep, freetype_dep, cairo_dep, epoxy_dep, xrender_dep, xrandr_dep, xext_dep, sm_dep, ice_dep, x11_dep],
+  dependencies: [
+    cairo_dep,
+    dl_dep,
+    epoxy_dep,
+    freetype_dep,
+    harfbuzz_dep,
+    ice_dep,
+    sm_dep,
+    x11_dep,
+    xext_dep,
+    xrandr_dep,
+    xrender_dep,
+  ], 
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
@@ -562,7 +629,11 @@ executable('vcldemo',
     vcl_lib,
   ],
   install: true,
-  dependencies: [harfbuzz_dep, dl_dep, x11_dep],
+  dependencies: [
+    dl_dep,
+    harfbuzz_dep,
+    x11_core_dep,
+  ],
 )
 
 desktopdetector_lib = shared_library('desktopdetector',
diff --git a/xmloff/meson.build b/xmloff/meson.build
index 91b27671a8ed..973bf2c807e1 100644
--- a/xmloff/meson.build
+++ b/xmloff/meson.build
@@ -316,7 +316,20 @@ xo_lib = shared_library('xolo',
   cpp_args: ['-DXMLOFF_DLLIMPLEMENTATION',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', setup_inc, '..'],
-  link_with: [basegfx_lib, comphelper_lib, cppuhelper_lib, cppu_lib, i18nlangtag_lib, salhelper_lib, sal_lib, sax_lib, svl_lib, tl_lib, utl_lib, vcl_lib],
+  link_with: [
+    basegfx_lib,
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    i18nlangtag_lib,
+    sal_lib,
+    salhelper_lib,
+    sax_lib,
+    svl_lib,
+    tl_lib,
+    utl_lib,
+    vcl_lib,
+  ],
   install: true,
 )
 
@@ -363,6 +376,14 @@ xof_lib = shared_library('xoflo',
   udk_fake_h, off_fake_h, tokens_hxx,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', setup_inc, '..'],
-  link_with: [comphelper_lib, cppu_lib, cppuhelper_lib, sal_lib, salhelper_lib, sax_lib, xo_lib],
+  link_with: [
+    comphelper_lib,
+    cppu_lib,
+    cppuhelper_lib,
+    sal_lib,
+    salhelper_lib,
+    sax_lib,
+    xo_lib,
+  ],
   install: true,
 )
commit e12a9b8555e007ca2e08a9de655e124fb6312d5e
Author:     Jussi Pakkanen <jpakkane at gmail.com>
AuthorDate: Sat Mar 14 18:33:54 2020 +0200
Commit:     Jussi Pakkanen <jpakkane at gmail.com>
CommitDate: Sat Mar 14 18:33:54 2020 +0200

    Build dict sources from data files.
    
    Change-Id: Ic995e62aaf61c77c708d997e0ff5f8c5ce901083

diff --git a/i18npool/breakiterator/dict_ja.cxx b/i18npool/breakiterator/dict_ja.cxx
deleted file mode 100644
index 9306c1f66a59..000000000000
--- a/i18npool/breakiterator/dict_ja.cxx
+++ /dev/null
@@ -1,36680 +0,0 @@
-/* !!!The file is generated automatically. DO NOT edit the file manually!!! */
-
-#include <sal/types.h>
-
-extern "C"
-{
-    static const sal_Unicode dataArea[] = {
-        0x5909, 0x8abf, 0x7dda, 0x7dda, 0x7dda, 0x5207, 0x3042, 0x3042, 0x3060, 0x3042, 0x306a,
-        0x3044, 0x3044, 0x3042, 0x3044, 0x3044, 0x3044, 0x308c, 0x306a, 0x3044, 0x3046, 0x3061,
-        0x3044, 0x304b, 0x308f, 0x3089, 0x305a, 0x3044, 0x304c, 0x3082, 0x3044, 0x304f, 0x308b,
-        0x3057, 0x3044, 0x3053, 0x3044, 0x305b, 0x3064, 0x3044, 0x305d, 0x3065, 0x304b, 0x3057,
-        0x3044, 0x305f, 0x3044, 0x305a, 0x304f, 0x3044, 0x3060, 0x3044, 0x3060, 0x3050, 0x3044,
-        0x3044, 0x3064, 0x3044, 0x306a, 0x3044, 0x306a, 0x3081, 0x3044, 0x306b, 0x304f, 0x3044,
-        0x306e, 0x3044, 0x306e, 0x3053, 0x3044, 0x306e, 0x3066, 0x3044, 0x306e, 0x308a, 0x3044,
-        0x306e, 0x5b50, 0x3044, 0x306e, 0x624b, 0x3044, 0x307e, 0x3044, 0x3044, 0x307e, 0x3044,
-        0x3055, 0x3044, 0x307e, 0x3044, 0x5ea6, 0x3044, 0x307e, 0x3063, 0x3066, 0x3044, 0x307f,
-        0x305f, 0x304c, 0x3044, 0x3044, 0x3082, 0x3061, 0x3044, 0x3089, 0x3057, 0x3044, 0x5909,
-        0x308f, 0x3044, 0x5b50, 0x3044, 0x8def, 0x3046, 0x3093, 0x3048, 0x3048, 0x3066, 0x3048,
-        0x306a, 0x3048, 0x7269, 0x304a, 0x304a, 0x3042, 0x304a, 0x304a, 0x3044, 0x304a, 0x3048,
-        0x3093, 0x3069, 0x3046, 0x304a, 0x304b, 0x3073, 0x304a, 0x304c, 0x3048, 0x308b, 0x304a,
-        0x304d, 0x304a, 0x304e, 0x308a, 0x304a, 0x304f, 0x3055, 0x304a, 0x3050, 0x308d, 0x304a,
-        0x3055, 0x304a, 0x3056, 0x3081, 0x304a, 0x3058, 0x308d, 0x304a, 0x305f, 0x304c, 0x3044,
-        0x304a, 0x3060, 0x3044, 0x3057, 0x3087, 0x3046, 0x304a, 0x3060, 0x3061, 0x304a, 0x3063,
-        0x307d, 0x304a, 0x306e, 0x3051, 0x304a, 0x306e, 0x308a, 0x304a, 0x3070, 0x304a, 0x3070,
-        0x3048, 0x304a, 0x3070, 0x3068, 0x304a, 0x3076, 0x304f, 0x308c, 0x304a, 0x307e, 0x3081,
-        0x304a, 0x307f, 0x304a, 0x307f, 0x3069, 0x308d, 0x304a, 0x3080, 0x3051, 0x304a, 0x3080,
-        0x3057, 0x304a, 0x3084, 0x304b, 0x304a, 0x308a, 0x304b, 0x304b, 0x3042, 0x304b, 0x3068,
-        0x304b, 0x3048, 0x3044, 0x304b, 0x304c, 0x3044, 0x304b, 0x304c, 0x3048, 0x308b, 0x304b,
-        0x304c, 0x3057, 0x304b, 0x304c, 0x306d, 0x304b, 0x304e, 0x308c, 0x304b, 0x3050, 0x308d,
-        0x304b, 0x3056, 0x304b, 0x3057, 0x304b, 0x3057, 0x304a, 0x304b, 0x3059, 0x308a, 0x304b,
-        0x305a, 0x304b, 0x3061, 0x3083, 0x3051, 0x304b, 0x3064, 0x304d, 0x304b, 0x3067, 0x307f,
-        0x3063, 0x304f, 0x304b, 0x3068, 0x3093, 0x307c, 0x304b, 0x306a, 0x3059, 0x304b, 0x306c,
-        0x3051, 0x304b, 0x306d, 0x304b, 0x306e, 0x307e, 0x3093, 0x307e, 0x304b, 0x306f, 0x3089,
-        0x304b, 0x307e, 0x3064, 0x304b, 0x307f, 0x304b, 0x3080, 0x3051, 0x304b, 0x3081, 0x304b,
-        0x3081, 0x3044, 0x3082, 0x304b, 0x3081, 0x304c, 0x3057, 0x308f, 0x304b, 0x3089, 0x304b,
-        0x3089, 0x304c, 0x304a, 0x304b, 0x3089, 0x3055, 0x307e, 0x304b, 0x3089, 0x3081, 0x304b,
-        0x308a, 0x304b, 0x308a, 0x3055, 0x304d, 0x304b, 0x308a, 0x3057, 0x3087, 0x3046, 0x3058,
-        0x304b, 0x308a, 0x3068, 0x308a, 0x304b, 0x308b, 0x304b, 0x308b, 0x307f, 0x304b, 0x3093,
-        0x3079, 0x304b, 0x3093, 0x307c, 0x3046, 0x304b, 0x3093, 0x307c, 0x304f, 0x304b, 0x30b2,
-        0x30c3, 0x30c8, 0x304b, 0x30c1, 0x30f3, 0x304b, 0x629c, 0x3051, 0x304c, 0x304c, 0x304d,
-        0x304c, 0x305f, 0x304c, 0x3063, 0x305f, 0x308a, 0x304c, 0x306a, 0x304c, 0x3081, 0x304c,
-        0x308a, 0x304c, 0x308a, 0x304b, 0x307e, 0x3061, 0x304c, 0x308a, 0x3050, 0x3061, 0x304c,
-        0x308a, 0x3060, 0x304b, 0x304c, 0x308a, 0x3060, 0x3093, 0x304c, 0x308a, 0x306f, 0x306a,
-        0x304c, 0x308a, 0x3070, 0x306a, 0x304c, 0x308a, 0x3081, 0x304c, 0x308a, 0x3082, 0x306e,
-        0x304c, 0x308a, 0x3084, 0x304c, 0x308a, 0x3086, 0x304c, 0x308a, 0x76ee, 0x304d, 0x304d,
-        0x3042, 0x304d, 0x304d, 0x3044, 0x304d, 0x304a, 0x3061, 0x304d, 0x304c, 0x3089, 0x304d,
-        0x3053, 0x304d, 0x3057, 0x3087, 0x3046, 0x304d, 0x305f, 0x308a, 0x306a, 0x304d, 0x306a,
-        0x304d, 0x306a, 0x3044, 0x304d, 0x306e, 0x304d, 0x307e, 0x304d, 0x3081, 0x304d, 0x3081,
-        0x304f, 0x3089, 0x304d, 0x3084, 0x304d, 0x3087, 0x3046, 0x307c, 0x304f, 0x304d, 0x3088,
-        0x304d, 0x3089, 0x304b, 0x304d, 0x3089, 0x3081, 0x304d, 0x308c, 0x304d, 0x308c, 0x304b,
-        0x3048, 0x304d, 0x3091, 0x304d, 0x5b50, 0x304d, 0x6c5f, 0x304e, 0x3068, 0x304f, 0x304f,
-        0x3042, 0x3089, 0x3044, 0x304f, 0x3057, 0x3064, 0x304f, 0x3057, 0x3087, 0x3046, 0x304f,
-        0x305b, 0x304f, 0x304f, 0x305f, 0x304f, 0x305f, 0x308c, 0x304f, 0x3061, 0x3076, 0x304f,
-        0x3069, 0x304f, 0x3073, 0x304f, 0x307e, 0x3067, 0x304f, 0x3089, 0x3064, 0x304f, 0x308b,
-        0x304f, 0x308b, 0x3072, 0x304f, 0x308b, 0x65e5, 0x304f, 0x4fc3, 0x3050, 0x3050, 0x306d,
-        0x3050, 0x3089, 0x3050, 0x308a, 0x3051, 0x3051, 0x304c, 0x305f, 0x3051, 0x304f, 0x308c,
-        0x3051, 0x3059, 0x3051, 0x3051, 0x305f, 0x3066, 0x3051, 0x3063, 0x3071, 0x306a, 0x3057,
-        0x3051, 0x3063, 0x3074, 0x308d, 0x3052, 0x3051, 0x306e, 0x3053, 0x3051, 0x306f, 0x306a,
-        0x3051, 0x306f, 0x306a, 0x308c, 0x3051, 0x306f, 0x3089, 0x3051, 0x3073, 0x3051, 0x307c,
-        0x306e, 0x3051, 0x307f, 0x3051, 0x3080, 0x3064, 0x3051, 0x308f, 0x305f, 0x3051, 0x7f8e,
-        0x3052, 0x3052, 0x304a, 0x308d, 0x3057, 0x3052, 0x304f, 0x3052, 0x304f, 0x306b, 0x3052,
-        0x3055, 0x3052, 0x3052, 0x3060, 0x3057, 0x3052, 0x3064, 0x3089, 0x3052, 0x306f, 0x3061,
-        0x3087, 0x3046, 0x3052, 0x307e, 0x304d, 0x3053, 0x3046, 0x3060, 0x3044, 0x3053, 0x3046,
-        0x307c, 0x304f, 0x3053, 0x3046, 0x9bdb, 0x3053, 0x304c, 0x308c, 0x3053, 0x304e, 0x3053,
-        0x3084, 0x304c, 0x3044, 0x3054, 0x3055, 0x3055, 0x3042, 0x3051, 0x3055, 0x3044, 0x3055,
-        0x3048, 0x3055, 0x304a, 0x304d, 0x3055, 0x304c, 0x3048, 0x308a, 0x3055, 0x304c, 0x304a,
-        0x3055, 0x304c, 0x3051, 0x3055, 0x304f, 0x3055, 0x306e, 0x308a, 0x3055, 0x3050, 0x308d,
-        0x3055, 0x3053, 0x3055, 0x3060, 0x3061, 0x3055, 0x3062, 0x3055, 0x3062, 0x304c, 0x306f,
-        0x3089, 0x3055, 0x3063, 0x3066, 0x3055, 0x3063, 0x3071, 0x3089, 0x3055, 0x3064, 0x304d,
-        0x3055, 0x306a, 0x3042, 0x3055, 0x306a, 0x3055, 0x306a, 0x3086, 0x3046, 0x306a, 0x3055,
-        0x306e, 0x3055, 0x306e, 0x306f, 0x3055, 0x306f, 0x304b, 0x3055, 0x3072, 0x3055, 0x307c,
-        0x3089, 0x3051, 0x3055, 0x307e, 0x3055, 0x307e, 0x3057, 0x3055, 0x307e, 0x3060, 0x304d,
-        0x3055, 0x307f, 0x3055, 0x3084, 0x3051, 0x3055, 0x3088, 0x3055, 0x308a, 0x3055, 0x5b50,
-        0x3055, 0x6c5f, 0x3056, 0x3056, 0x3051, 0x3056, 0x3068, 0x3056, 0x306a, 0x3056, 0x307f,
-        0x3056, 0x307f, 0x91ce, 0x3056, 0x3080, 0x3056, 0x3084, 0x304b, 0x3056, 0x3089, 0x3057,
-        0x3056, 0x7b11, 0x3057, 0x3057, 0x304b, 0x3057, 0x304b, 0x3051, 0x3057, 0x304b, 0x3089,
-        0x305a, 0x3057, 0x304c, 0x304b, 0x308a, 0x3057, 0x304c, 0x305f, 0x3081, 0x3057, 0x304c,
-        0x3089, 0x307f, 0x3057, 0x3054, 0x3057, 0x3089, 0x3048, 0x3057, 0x305a, 0x308a, 0x3057,
-        0x305f, 0x3057, 0x3060, 0x307e, 0x308a, 0x3057, 0x3064, 0x3044, 0x3067, 0x3057, 0x3064,
-        0x304d, 0x3057, 0x3064, 0x304e, 0x3057, 0x3066, 0x307e, 0x3068, 0x3044, 0x3057, 0x3067,
-        0x304c, 0x304d, 0x3057, 0x3068, 0x308a, 0x3057, 0x3069, 0x3081, 0x3057, 0x3069, 0x308a,
-        0x3057, 0x306a, 0x3048, 0x3057, 0x306a, 0x304c, 0x3070, 0x3061, 0x3057, 0x306a, 0x3089,
-        0x3057, 0x3057, 0x306f, 0x3089, 0x306e, 0x306a, 0x304b, 0x3064, 0x304f, 0x306b, 0x3057,
-        0x306f, 0x3089, 0x306e, 0x307f, 0x305a, 0x307b, 0x306e, 0x304f, 0x306b, 0x3057, 0x3073,
-        0x3057, 0x3076, 0x307f, 0x3057, 0x307e, 0x304b, 0x305b, 0x3057, 0x307e, 0x3081, 0x3057,
-        0x3088, 0x308f, 0x3057, 0x3089, 0x3057, 0x3089, 0x3044, 0x3057, 0x539f, 0x753a, 0x3058,
-        0x3058, 0x304d, 0x306a, 0x3058, 0x3051, 0x306a, 0x3058, 0x3055, 0x3044, 0x3058, 0x3082,
-        0x305d, 0x3063, 0x3051, 0x3082, 0x306a, 0x3058, 0x308f, 0x3058, 0x308f, 0x3044, 0x3059,
-        0x304b, 0x3059, 0x3053, 0x3059, 0x306a, 0x308d, 0x305a, 0x304b, 0x305a, 0x304b, 0x308a,
-        0x305a, 0x304b, 0x308c, 0x305a, 0x304d, 0x305a, 0x304d, 0x3044, 0x308d, 0x305a, 0x3051,
-        0x305a, 0x3055, 0x305a, 0x307e, 0x305a, 0x307e, 0x30b3, 0x30fc, 0x30c8, 0x305b, 0x305b,
-        0x3057, 0x3089, 0x305a, 0x305b, 0x3060, 0x304f, 0x305b, 0x3068, 0x308a, 0x305b, 0x3070,
-        0x305b, 0x3073, 0x305b, 0x307f, 0x305a, 0x304f, 0x305b, 0x307f, 0x3069, 0x308d, 0x305b,
-        0x3082, 0x305c, 0x305c, 0x3093, 0x305d, 0x305d, 0x3053, 0x305d, 0x3070, 0x305d, 0x3070,
-        0x305b, 0x3053, 0x3068, 0x3070, 0x305d, 0x3070, 0x305b, 0x8a00, 0x8449, 0x305d, 0x3073,
-        0x305d, 0x3073, 0x306b, 0x3093, 0x305d, 0x3073, 0x3081, 0x305f, 0x305f, 0x3044, 0x305f,
-        0x3048, 0x305f, 0x304b, 0x3082, 0x305f, 0x304b, 0x3082, 0x3088, 0x3057, 0x305f, 0x3051,
-        0x305f, 0x3057, 0x305f, 0x3058, 0x3051, 0x306a, 0x305f, 0x305f, 0x304b, 0x305f, 0x305f,
-        0x307e, 0x305f, 0x305f, 0x3081, 0x305f, 0x3075, 0x305f, 0x305f, 0x307e, 0x305f, 0x307e,
-        0x304b, 0x3089, 0x305f, 0x307e, 0x3054, 0x306a, 0x3057, 0x305f, 0x307e, 0x3067, 0x3063,
-        0x304b, 0x3061, 0x305f, 0x3089, 0x305f, 0x3089, 0x3057, 0x305f, 0x3089, 0x305a, 0x3055,
-        0x308f, 0x3089, 0x305a, 0x305f, 0x308a, 0x305f, 0x308a, 0x304d, 0x3087, 0x3046, 0x3052,
-        0x3093, 0x305f, 0x308a, 0x3055, 0x308f, 0x308a, 0x305f, 0x308a, 0x3061, 0x3089, 0x305f,
-        0x308a, 0x3069, 0x3057, 0x305f, 0x308a, 0x3070, 0x3053, 0x305f, 0x308a, 0x3070, 0x3061,
-        0x305f, 0x308a, 0x307e, 0x3048, 0x305f, 0x308a, 0x3084, 0x305f, 0x308a, 0x3084, 0x304f,
-        0x305f, 0x308c, 0x3060, 0x3060, 0x3063, 0x307d, 0x3060, 0x3081, 0x3060, 0x540d, 0x3060,
-        0x82b1, 0x3061, 0x3061, 0x3053, 0x3061, 0x3061, 0x3083, 0x3089, 0x304b, 0x3061, 0x3089,
-        0x3061, 0x3089, 0x304c, 0x3048, 0x308a, 0x3061, 0x3089, 0x5e30, 0x308a, 0x3062, 0x304d,
-        0x306a, 0x3063, 0x3063, 0x3051, 0x3063, 0x3051, 0x306a, 0x3063, 0x3051, 0x3089, 0x304b,
-        0x3093, 0x3068, 0x3063, 0x3055, 0x308a, 0x3063, 0x305f, 0x307e, 0x3063, 0x305f, 0x3089,
-        0x3063, 0x3061, 0x3063, 0x3068, 0x3046, 0x3066, 0x304d, 0x3063, 0x3071, 0x3063, 0x3071,
-        0x3063, 0x3071, 0x308c, 0x3063, 0x3077, 0x3042, 0x3063, 0x3077, 0x3064, 0x3064, 0x304b,
-        0x3064, 0x304b, 0x3044, 0x3064, 0x304b, 0x307e, 0x3057, 0x3064, 0x304f, 0x308b, 0x3057,
-        0x3064, 0x307c, 0x3063, 0x305f, 0x3064, 0x307e, 0x3064, 0x307e, 0x308a, 0x3064, 0x307f,
-        0x3064, 0x3081, 0x3064, 0x3082, 0x306e, 0x3064, 0x3088, 0x3064, 0x3089, 0x3048, 0x3064,
-        0x3089, 0x3048, 0x3080, 0x304d, 0x3064, 0x308c, 0x304d, 0x3064, 0x5b50, 0x3065, 0x304b,
-        0x3065, 0x3055, 0x3065, 0x307e, 0x3066, 0x3066, 0x3044, 0x307c, 0x304f, 0x3066, 0x3046,
-        0x307e, 0x3066, 0x304c, 0x3066, 0x304c, 0x3044, 0x3076, 0x3061, 0x3066, 0x3053, 0x3066,
-        0x3053, 0x3059, 0x3066, 0x3054, 0x3068, 0x3066, 0x3055, 0x304d, 0x3066, 0x3058, 0x3066,
-        0x305a, 0x3044, 0x308a, 0x3087, 0x3046, 0x3066, 0x305a, 0x3063, 0x307d, 0x3046, 0x3066,
-        0x3064, 0x3051, 0x3066, 0x3069, 0x3066, 0x306a, 0x3066, 0x306a, 0x3057, 0x3066, 0x306f,
-        0x305a, 0x308c, 0x3066, 0x306f, 0x307e, 0x3066, 0x306f, 0x3081, 0x3066, 0x3082, 0x306e,
-        0x3066, 0x308c, 0x3053, 0x3066, 0x30ec, 0x30b3, 0x3066, 0x5148, 0x3066, 0x540d, 0x3066,
-        0x5916, 0x308c, 0x3066, 0x7121, 0x3057, 0x3066, 0x99ac, 0x3067, 0x3067, 0x3084, 0x304b,
-        0x3067, 0x59ff, 0x3068, 0x3068, 0x304a, 0x3055, 0x3048, 0x3068, 0x304a, 0x3057, 0x3068,
-        0x304b, 0x305f, 0x3065, 0x3051, 0x3068, 0x304f, 0x3055, 0x308c, 0x3068, 0x3058, 0x3055,
-        0x308a, 0x3068, 0x305a, 0x3055, 0x308a, 0x3068, 0x3064, 0x304e, 0x3068, 0x3065, 0x3051,
-        0x3068, 0x3068, 0x308a, 0x3068, 0x306e, 0x307e, 0x3064, 0x308a, 0x3068, 0x3070, 0x3089,
-        0x3044, 0x3068, 0x3072, 0x304d, 0x3068, 0x307e, 0x308f, 0x3057, 0x3068, 0x3082, 0x3069,
-        0x308a, 0x3068, 0x308a, 0x3069, 0x3051, 0x306a, 0x306a, 0x306a, 0x3046, 0x3081, 0x306a,
-        0x304b, 0x3057, 0x3053, 0x306a, 0x304c, 0x3061, 0x306a, 0x3050, 0x307e, 0x306a, 0x3050,
-        0x3089, 0x306a, 0x3054, 0x306a, 0x305f, 0x306a, 0x305f, 0x307e, 0x304b, 0x305b, 0x306a,
-        0x3069, 0x306b, 0x306b, 0x3044, 0x306b, 0x3088, 0x3081, 0x306d, 0x306d, 0x3055, 0x3093,
-        0x304b, 0x3076, 0x308a, 0x306d, 0x3055, 0x3093, 0x88ab, 0x308a, 0x306e, 0x306e, 0x3053,
-        0x3068, 0x306e, 0x3053, 0x308d, 0x306e, 0x3068, 0x304d, 0x306e, 0x3068, 0x3053, 0x308d,
-        0x306e, 0x307e, 0x307e, 0x306e, 0x3082, 0x306e, 0x306e, 0x3088, 0x306e, 0x308f, 0x3051,
-        0x306e, 0x4e16, 0x306e, 0x4e8b, 0x306e, 0x4eba, 0x306e, 0x6240, 0x306e, 0x65b9, 0x306e,
-        0x65e5, 0x306e, 0x6642, 0x306e, 0x7269, 0x306e, 0x8a33, 0x306e, 0x9803, 0x306f, 0x308c,
-        0x3070, 0x3070, 0x305a, 0x308c, 0x3070, 0x305f, 0x3082, 0x3048, 0x304f, 0x307c, 0x3070,
-        0x3089, 0x3070, 0x3089, 0x3084, 0x3070, 0x3089, 0x5bb6, 0x3070, 0x3089, 0x5c4b, 0x3070,
-        0x308c, 0x3070, 0x308c, 0x307e, 0x308f, 0x3072, 0x308b, 0x3073, 0x3073, 0x305b, 0x3075,
-        0x3075, 0x308c, 0x3075, 0x308c, 0x3067, 0x3075, 0x308c, 0x691c, 0x67fb, 0x3076, 0x3076,
-        0x306a, 0x3076, 0x306a, 0x3063, 0x304b, 0x3057, 0x3076, 0x306f, 0x3061, 0x3068, 0x3089,
-        0x305a, 0x3076, 0x307f, 0x3076, 0x3089, 0x3076, 0x3089, 0x304e, 0x3076, 0x3089, 0x3058,
-        0x307f, 0x3076, 0x3089, 0x305c, 0x307f, 0x3076, 0x3089, 0x3063, 0x3053, 0x3076, 0x3089,
-        0x3067, 0x308a, 0x3076, 0x3089, 0x306a, 0x3076, 0x3089, 0x3080, 0x3057, 0x3076, 0x308a,
-        0x3060, 0x3076, 0x308a, 0x3060, 0x3057, 0x3076, 0x308a, 0x3082, 0x306e, 0x3076, 0x308a,
-        0x51fa, 0x3057, 0x3076, 0x308a, 0x7269, 0x3076, 0x308c, 0x3076, 0x308c, 0x3082, 0x306e,
-        0x3076, 0x308c, 0x8005, 0x3079, 0x3053, 0x3079, 0x307b, 0x3046, 0x307b, 0x3046, 0x3069,
-        0x308a, 0x307e, 0x307e, 0x3048, 0x307e, 0x3048, 0x3093, 0x307c, 0x3046, 0x307e, 0x3048,
-        0x3093, 0x574a, 0x307e, 0x304a, 0x304a, 0x3044, 0x307e, 0x304a, 0x3061, 0x307e, 0x304c,
-        0x3048, 0x308b, 0x307e, 0x304f, 0x3060, 0x308a, 0x307e, 0x3054, 0x3044, 0x307e, 0x3056,
-        0x3051, 0x307e, 0x3056, 0x3089, 0x3057, 0x307e, 0x305a, 0x3063, 0x3071, 0x307e, 0x305f,
-        0x307e, 0x3060, 0x3044, 0x307e, 0x3060, 0x308c, 0x307e, 0x3060, 0x308c, 0x304a, 0x3061,
-        0x307e, 0x3061, 0x3087, 0x308d, 0x307e, 0x3063, 0x3055, 0x3048, 0x307e, 0x3063, 0x305f,
-        0x308b, 0x307e, 0x3063, 0x305f, 0x308c, 0x307e, 0x306b, 0x307e, 0x306d, 0x307e, 0x306d,
-        0x304f, 0x307e, 0x306e, 0x304c, 0x308f, 0x307e, 0x306e, 0x3058, 0x3083, 0x304f, 0x307e,
-        0x306e, 0x308a, 0x307e, 0x307c, 0x3057, 0x307e, 0x307f, 0x307e, 0x3082, 0x3088, 0x3044,
-        0x307e, 0x3082, 0x308a, 0x307e, 0x3084, 0x304b, 0x307e, 0x3084, 0x3069, 0x308a, 0x307e,
-        0x3084, 0x307f, 0x307e, 0x3088, 0x3051, 0x307e, 0x308a, 0x307e, 0x308a, 0x306b, 0x307e,
-        0x308a, 0x3082, 0x306e, 0x307e, 0x3093, 0x307e, 0x3093, 0x3058, 0x307f, 0x307f, 0x3042,
-        0x3052, 0x307f, 0x3046, 0x3061, 0x307f, 0x3059, 0x304d, 0x307f, 0x3060, 0x307f, 0x3060,
-        0x304b, 0x3076, 0x308a, 0x307f, 0x3060, 0x304f, 0x3058, 0x3081, 0x3081, 0x3042, 0x304c,
-        0x308a, 0x3081, 0x304c, 0x3057, 0x305f, 0x3081, 0x304c, 0x3061, 0x3081, 0x306e, 0x3046,
-        0x304a, 0x3081, 0x3075, 0x308a, 0x3081, 0x308a, 0x304b, 0x3057, 0x308d, 0x3072, 0x3068,
-        0x308a, 0x3081, 0x3093, 0x307c, 0x3081, 0x8272, 0x3084, 0x3084, 0x3046, 0x3084, 0x3046,
-        0x304f, 0x3084, 0x304b, 0x3084, 0x304b, 0x3057, 0x3084, 0x304b, 0x308a, 0x3082, 0x306e,
-        0x3084, 0x304b, 0x308a, 0x8005, 0x3084, 0x3053, 0x3084, 0x3057, 0x3084, 0x3064, 0x3084,
-        0x3064, 0x308a, 0x3084, 0x3068, 0x308a, 0x3084, 0x306a, 0x3084, 0x306b, 0x3084, 0x306e,
-        0x3084, 0x3075, 0x3084, 0x3084, 0x3076, 0x3084, 0x307e, 0x3084, 0x307e, 0x3061, 0x3084,
-        0x3081, 0x3084, 0x3092, 0x3084, 0x5b50, 0x3086, 0x3086, 0x307f, 0x3086, 0x307f, 0x3042,
-        0x3044, 0x3086, 0x307f, 0x3044, 0x305f, 0x3086, 0x307f, 0x3088, 0x3089, 0x3089, 0x3042,
-        0x3089, 0x3089, 0x3042, 0x3089, 0x304b, 0x3057, 0x3053, 0x3089, 0x3042, 0x3089, 0x3057,
-        0x3089, 0x3044, 0x3089, 0x3044, 0x3042, 0x3052, 0x3089, 0x3044, 0x304c, 0x307f, 0x3089,
-        0x3044, 0x3053, 0x3089, 0x3044, 0x3056, 0x3089, 0x3044, 0x3089, 0x3044, 0x3056, 0x3089,
-        0x3057, 0x3089, 0x3044, 0x3059, 0x3059, 0x304e, 0x3089, 0x3044, 0x305f, 0x3066, 0x3089,
-        0x3044, 0x3060, 0x3057, 0x3089, 0x3044, 0x306f, 0x308a, 0x3089, 0x3044, 0x3082, 0x306e,
-        0x3089, 0x304b, 0x3058, 0x3081, 0x3089, 0x304b, 0x305b, 0x304e, 0x3089, 0x304c, 0x3089,
-        0x304c, 0x306d, 0x3089, 0x304f, 0x308c, 0x3089, 0x3051, 0x305a, 0x308a, 0x3089, 0x3054,
-        0x306a, 0x3057, 0x3089, 0x3055, 0x304c, 0x3057, 0x3089, 0x3057, 0x3089, 0x305a, 0x3082,
-        0x304c, 0x306a, 0x3089, 0x305b, 0x3044, 0x3068, 0x3046, 0x3089, 0x305d, 0x3089, 0x305d,
-        0x3044, 0x3089, 0x305f, 0x3089, 0x305f, 0x304b, 0x3089, 0x305f, 0x307e, 0x3089, 0x305f,
-        0x3081, 0x3089, 0x305f, 0x3081, 0x3066, 0x3089, 0x3060, 0x3066, 0x3089, 0x3063, 0x307d,
-        0x3089, 0x3065, 0x304f, 0x308a, 0x3089, 0x306c, 0x3089, 0x307e, 0x3057, 0x3089, 0x307e,
-        0x307b, 0x3057, 0x304d, 0x3089, 0x3081, 0x3089, 0x3086, 0x308b, 0x3089, 0x3089, 0x304b,
-        0x3089, 0x3089, 0x304e, 0x3089, 0x3089, 0x3052, 0x3089, 0x308c, 0x3089, 0x308c, 0x3082,
-        0x306a, 0x3089, 0x308f, 0x3089, 0x308f, 0x308c, 0x3089, 0x3093, 0x304b, 0x304e, 0x308a,
-        0x3089, 0x3093, 0x9650, 0x308a, 0x3089, 0x635c, 0x3057, 0x308a, 0x308a, 0x3042, 0x3044,
-        0x308a, 0x3042, 0x308a, 0x308a, 0x3042, 0x308f, 0x305b, 0x308a, 0x3046, 0x3061, 0x308a,
-        0x3048, 0x308a, 0x304b, 0x308a, 0x304b, 0x305f, 0x308a, 0x304c, 0x305f, 0x308a, 0x304c,
-        0x305f, 0x304c, 0x308a, 0x304c, 0x305f, 0x307f, 0x308a, 0x304c, 0x305f, 0x3081, 0x3044,
-        0x308f, 0x304f, 0x308a, 0x304c, 0x3061, 0x308a, 0x304c, 0x3068, 0x3046, 0x308a, 0x304c,
-        0x306d, 0x308a, 0x304d, 0x305f, 0x308a, 0x308a, 0x304f, 0x3044, 0x308a, 0x3052, 0x308a,
-        0x3055, 0x307e, 0x308a, 0x3057, 0x308a, 0x3058, 0x3054, 0x304f, 0x308a, 0x3063, 0x304d,
-        0x308a, 0x308a, 0x3063, 0x305f, 0x3051, 0x308a, 0x3064, 0x308a, 0x3065, 0x304b, 0x308a,
-        0x3068, 0x3042, 0x3089, 0x3086, 0x308b, 0x308a, 0x306e, 0x3068, 0x3046, 0x308a, 0x306e,
-        0x307e, 0x307e, 0x308a, 0x306e, 0x307f, 0x308a, 0x3075, 0x308c, 0x308a, 0x307e, 0x304d,
-        0x308a, 0x3088, 0x3046, 0x308a, 0x5408, 0x305b, 0x308a, 0x65b9, 0x308b, 0x308b, 0x3044,
-        0x306f, 0x308b, 0x304b, 0x3044, 0x3063, 0x304f, 0x308b, 0x3058, 0x308b, 0x3068, 0x304d,
-        0x3070, 0x3089, 0x3044, 0x308b, 0x306f, 0x308b, 0x4eba, 0x308b, 0x65e5, 0x308b, 0x6642,
-        0x308c, 0x308c, 0x304b, 0x3089, 0x308c, 0x3057, 0x304d, 0x308c, 0x3057, 0x3087, 0x3046,
-        0x308c, 0x3060, 0x3051, 0x308c, 0x3061, 0x308c, 0x306e, 0x308c, 0x306f, 0x3060, 0x308c,
-        0x3089, 0x308c, 0x6027, 0x308c, 0x808c, 0x308f, 0x308f, 0x3044, 0x308f, 0x3055, 0x308f,
-        0x305b, 0x308f, 0x305b, 0x3044, 0x3068, 0x308f, 0x305b, 0x304b, 0x304c, 0x307f, 0x308f,
-        0x305b, 0x305a, 0x308f, 0x305b, 0x3066, 0x308f, 0x305b, 0x3069, 0x308f, 0x305b, 0x7cf8,
-        0x308f, 0x305b, 0x9162, 0x308f, 0x305b, 0x93e1, 0x308f, 0x305f, 0x3060, 0x3057, 0x308f,
-        0x3066, 0x308f, 0x3066, 0x3075, 0x305f, 0x3081, 0x308f, 0x3073, 0x308f, 0x3084, 0x308f,
-        0x3088, 0x304f, 0x3070, 0x308f, 0x308c, 0x308f, 0x308c, 0x304c, 0x308f, 0x7acb, 0x3091,
-        0x5b50, 0x3093, 0x3093, 0x3044, 0x3093, 0x3044, 0x3064, 0x3093, 0x3046, 0x3064, 0x3093,

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list