summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>2020-02-22 23:18:38 +0000
committerJan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>2020-03-14 23:34:22 +0000
commitbe1f3e4621a2eda792ca1955c87c35d5da347979 (patch)
tree2ed4c076d1466474f0ec1983b575151cb3b3579c
parent555f57b914c99c06a9e54efb34e2518357bf0552 (diff)
Build needs Orcus >= 0.15
Change-Id: I70df961a08e2db533a81cca5d214e1300a13eb2e
-rw-r--r--meson.build2
-rw-r--r--sc/meson.build396
2 files changed, 202 insertions, 196 deletions
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',