Skip to content

C
core
Kaydet (Commit) 36788e95 authored tarafından Markus Mohrhard's avatar Markus Mohrhard
Dosyalara gözat
Seçenekler

upgrade liborcus 

Conflicts:

	external/boost/StaticLibrary_boost_system.mk

Change-Id: Ie4af26c87a100b67baeedbaa7fb1ac428845f92b
üst 0035b321
Hide whitespace changes
Inline Side-by-side
Showing with 190 additions and 34 deletions
RepositoryExternal.mk
Dosyayı görüntüle @ 36788e95
......@@ -615,7 +615,23 @@ $(call gb_LinkTarget_add_libs,$(1),\
endef
define gb_LinkTarget__use_boostsystem
define gb_LinkTarget__use_boost_iostreams
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(BOOST_CPPFLAGS) \
)
$(call gb_LinkTarget_add_ldflags,$(1),\
$(BOOST_LDFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),\
$(BOOST_IOSTREAMS_LIB) \
)
endef
define gb_LinkTarget__use_boost_system
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(BOOST_CPPFLAGS) \
......@@ -631,7 +647,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
endef
gb_ExternalProject__use_boostsystem :=
gb_ExternalProject__use_boost_system :=
define gb_LinkTarget__use_boost_headers
$(call gb_LinkTarget_set_include,$(1),\
......@@ -668,19 +684,34 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
endef
define gb_LinkTarget__use_boostsystem
define gb_LinkTarget__use_boost_iostreams
$(call gb_LinkTarget_add_defs,$(1),\
-DBOOST_ALL_NO_LIB \
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
boost_iostreams \
)
endef
define gb_ExternalProject__use_boost_iostreams
$(call gb_ExternalProject_use_static_libraries,$(1),boost_iostreams)
endef
define gb_LinkTarget__use_boost_system
$(call gb_LinkTarget_add_defs,$(1),\
-DBOOST_ALL_NO_LIB \
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
boostsystem \
boost_system \
)
endef
define gb_ExternalProject__use_boostsystem
$(call gb_ExternalProject_use_static_libraries,$(1),boostsystem)
define gb_ExternalProject__use_boost_system
$(call gb_ExternalProject_use_static_libraries,$(1),boost_system)
endef
define gb_LinkTarget__use_boost_headers
......@@ -2755,7 +2786,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
)
$(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.6$(gb_StaticLibrary_PLAINEXT) \
$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.8$(gb_StaticLibrary_PLAINEXT) \
)
$(if $(SYSTEM_BOOST), \
......@@ -2772,7 +2803,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
)
$(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.6$(gb_StaticLibrary_PLAINEXT) \
$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.8$(gb_StaticLibrary_PLAINEXT) \
)
endef
......
avmedia/Library_avmediavlc.mk
Dosyayı görüntüle @ 36788e95
......@@ -22,7 +22,7 @@ $(eval $(call gb_Library_use_sdk_api,avmediavlc))
$(eval $(call gb_Library_use_externals,avmediavlc,\
boost_headers \
boostsystem \
boost_system \
))
$(eval $(call gb_Library_use_libraries,avmediavlc,\
......
config_host.mk.in
Dosyayı görüntüle @ 36788e95
......@@ -35,6 +35,7 @@ export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@
export BOOST_CPPFLAGS=@BOOST_CPPFLAGS@
export BOOST_CXXFLAGS=@BOOST_CXXFLAGS@
export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
export BOOST_IOSTREAMS_LIB=@BOOST_IOSTREAMS_LIB@
export BOOST_LDFLAGS=@BOOST_LDFLAGS@
export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@
export BRAND_INTRO_IMAGES=@BRAND_INTRO_IMAGES@
......
configure.ac
Dosyayı görüntüle @ 36788e95
......@@ -8554,6 +8554,7 @@ if test "$with_system_boost" = "yes"; then
SYSTEM_BOOST=TRUE
AX_BOOST_BASE(1.47)
AX_BOOST_DATE_TIME
AX_BOOST_IOSTREAMS
mingw_boost_date_time_dll=`echo $BOOST_DATE_TIME_LIB | sed -e 's/^-l//' -e 's/\.dll$//'`
libo_MINGW_TRY_DLL([$mingw_boost_date_time_dll])
if test -z "$MINGW_BOOST_DATE_TIME_DLL"; then
......
download.lst
Dosyayı görüntüle @ 36788e95
......@@ -93,7 +93,7 @@ export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
export NSS_TARBALL := 06beb053e257d9e22641339c905c6eba-nss-3.15.3-with-nspr-4.10.2.tar.gz
export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
export OPENSSL_TARBALL := 66bf6f10f060d561929de96f9dfe5b8c-openssl-1.0.1e.tar.gz
export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
export ORCUS_TARBALL := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
export POPPLER_TARBALL := 1cd27460f7e3379d1eb109cfd7bcdb39-poppler-0.22.5.tar.gz
......
external/boost/Module_boost.mk
Dosyayı görüntüle @ 36788e95
......@@ -11,7 +11,8 @@ $(eval $(call gb_Module_Module,boost))
$(eval $(call gb_Module_add_targets,boost,\
StaticLibrary_boostdatetime \
StaticLibrary_boostsystem \
StaticLibrary_boost_system \
StaticLibrary_boost_iostreams \
UnpackedTarball_boost \
))
......
external/boost/StaticLibrary_boost_iostreams.mk 0 → 100644
Dosyayı görüntüle @ 36788e95
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_StaticLibrary_StaticLibrary,boost_iostreams))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost_iostreams))
# disable "auto link" "feature" on MSVC
$(eval $(call gb_StaticLibrary_add_defs,boost_iostreams,\
-DBOOST_ALL_NO_LIB \
))
$(eval $(call gb_StaticLibrary_use_unpacked,boost_iostreams,boost))
$(eval $(call gb_StaticLibrary_use_externals,boost_iostreams, \
zlib \
boost_headers \
))
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_iostreams,cpp))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_iostreams,\
UnpackedTarball/boost/libs/iostreams/src/zlib \
UnpackedTarball/boost/libs/iostreams/src/gzip \
UnpackedTarball/boost/libs/iostreams/src/file_descriptor \
))
# vim: set noet sw=4 ts=4:
external/boost/StaticLibrary_boostsystem.mk → external/boost/StaticLibrary_boost_system.mk
Dosyayı görüntüle @ 36788e95
......@@ -7,22 +7,22 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_StaticLibrary_StaticLibrary,boostsystem))
$(eval $(call gb_StaticLibrary_StaticLibrary,boost_system))
$(eval $(call gb_StaticLibrary_use_unpacked,boostsystem,boost))
$(eval $(call gb_StaticLibrary_use_unpacked,boost_system,boost))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostsystem))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost_system))
# disable "auto link" "feature" on MSVC
$(eval $(call gb_StaticLibrary_add_defs,boostsystem,\
$(eval $(call gb_StaticLibrary_add_defs,boost_system,\
-DBOOST_ALL_NO_LIB \
))
$(eval $(call gb_StaticLibrary_use_external,boostsystem,boost_headers))
$(eval $(call gb_StaticLibrary_use_external,boost_system,boost_headers))
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostsystem,cpp))
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_system,cpp))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boostsystem,\
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_system,\
UnpackedTarball/boost/libs/system/src/error_code \
))
......
external/liborcus/ExternalProject_liborcus.mk
Dosyayı görüntüle @ 36788e95
......@@ -13,7 +13,9 @@ $(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
$(eval $(call gb_ExternalProject_use_externals,liborcus, \
boost_headers \
boostsystem \
boost_iostreams \
boost_system \
mdds_headers \
zlib \
))
......@@ -36,9 +38,9 @@ ifneq ($(SYSTEM_ZLIB),)
liborcus_LIBS+=-lz
endif
ifneq ($(SYSTEM_BOOST),)
liborcus_LIBS+=$(BOOST_SYSTEM_LIB)
liborcus_LIBS+=$(BOOST_SYSTEM_LIB) $(BOOST_IOSTREAMS_LIB)
else
liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboostsystem
liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboost_system -lboost_iostreams
endif
ifeq ($(OS),ANDROID)
liborcus_LIBS+=-lgnustl_shared -lm
......@@ -88,15 +90,18 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
$(if $(liborcus_CXXFLAGS),CXXFLAGS='$(liborcus_CXXFLAGS)') \
$(if $(liborcus_CPPFLAGS),CPPFLAGS='$(liborcus_CPPFLAGS)') \
$(if $(liborcus_LDFLAGS),LDFLAGS='$(liborcus_LDFLAGS)') \
MDDS_CFLAGS='$(MDDS_CFLAGS)' \
MDDS_LIBS=' ' \
./configure \
--with-pic \
--enable-static \
--disable-shared \
$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
--disable-spreadsheet-model \
--without-tools \
--disable-werror \
$(if $(SYSTEM_BOOST),,--with-boost=$(WORKDIR)/UnpackedTarball/boost) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(SYSTEM_BOOST),,--with-boost-system=boostsystem) \
&& $(if $(VERBOSE)$(verbose),V=1) \
$(MAKE) \
)
......
external/liborcus/UnpackedTarball_liborcus.mk
Dosyayı görüntüle @ 36788e95
......@@ -16,14 +16,11 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,0))
liborcus_patches :=
# make config.sub recognize arm-linux-androideabi
liborcus_patches += liborcus_0.1.0-configure.patch
# liborcus_patches += liborcus_0.1.0-configure.patch
# don't use dllimport
liborcus_patches += liborcus_0.1.0-dllimport.patch
# fdo#63844
liborcus_patches += liborcus-handle-invalid-xml.patch.1
ifeq ($(OS),MACOSX)
# no "tac" command on OS X, but "tail -r"
liborcus_patches += liborcus_0.1.0-tac.patch
......
sc/Library_scfilt.mk
Dosyayı görüntüle @ 36788e95
......@@ -32,7 +32,8 @@ $(eval $(call gb_Library_use_externals,scfilt,\
orcus \
orcus-parser \
boost_headers \
boostsystem \
boost_system \
boost_iostreams \
mdds_headers \
zlib \
))
......
sc/qa/unit/helper/qahelper.cxx
Dosyayı görüntüle @ 36788e95
......@@ -112,7 +112,7 @@ void loadFile(const OUString& aFileName, std::string& aContent)
void testFile(OUString& aFileName, ScDocument* pDoc, SCTAB nTab, StringType aStringFormat)
{
csv_handler aHandler(pDoc, nTab, aStringFormat);
orcus::csv_parser_config aConfig;
orcus::csv::parser_config aConfig;
aConfig.delimiters.push_back(',');
aConfig.delimiters.push_back(';');
aConfig.text_qualifier = '"';
......@@ -126,7 +126,7 @@ void testFile(OUString& aFileName, ScDocument* pDoc, SCTAB nTab, StringType aStr
{
parser.parse();
}
catch (const orcus::csv_parse_error& e)
catch (const orcus::csv::parse_error& e)
{
std::cout << "reading csv content file failed: " << e.what() << std::endl;
OStringBuffer aErrorMsg("csv parser error: ");
......@@ -138,7 +138,7 @@ void testFile(OUString& aFileName, ScDocument* pDoc, SCTAB nTab, StringType aStr
void testCondFile(OUString& aFileName, ScDocument* pDoc, SCTAB nTab)
{
conditional_format_handler aHandler(pDoc, nTab);
orcus::csv_parser_config aConfig;
orcus::csv::parser_config aConfig;
aConfig.delimiters.push_back(',');
aConfig.delimiters.push_back(';');
aConfig.text_qualifier = '"';
......@@ -149,7 +149,7 @@ void testCondFile(OUString& aFileName, ScDocument* pDoc, SCTAB nTab)
{
parser.parse();
}
catch (const orcus::csv_parse_error& e)
catch (const orcus::csv::parse_error& e)
{
std::cout << "reading csv content file failed: " << e.what() << std::endl;
OStringBuffer aErrorMsg("csv parser error: ");
......
sc/source/filter/inc/orcusinterface.hxx
Dosyayı görüntüle @ 36788e95
......@@ -59,8 +59,13 @@ public:
virtual void set_segment_bold(bool b);
virtual void set_segment_italic(bool b);
virtual void set_segment_font(size_t font_index);
virtual void set_segment_font_name(const char* s, size_t n);
virtual void set_segment_font_size(double point);
virtual void set_segment_font_color(orcus::spreadsheet::color_elem_t alpha,
orcus::spreadsheet::color_elem_t red,
orcus::spreadsheet::color_elem_t green,
orcus::spreadsheet::color_elem_t blue);
virtual void append_segment(const char* s, size_t n);
virtual size_t commit_segments();
......@@ -129,6 +134,10 @@ public:
virtual void set_font_name(const char* s, size_t n);
virtual void set_font_size(double point);
virtual void set_font_underline(orcus::spreadsheet::underline_t e);
virtual void set_font_color( orcus::spreadsheet::color_elem_t alpha,
orcus::spreadsheet::color_elem_t red,
orcus::spreadsheet::color_elem_t green,
orcus::spreadsheet::color_elem_t blue);
virtual size_t commit_font();
// fill
......@@ -143,6 +152,11 @@ public:
virtual void set_border_count(size_t n);
virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n);
virtual void set_border_color(orcus::spreadsheet::border_direction_t dir,
orcus::spreadsheet::color_elem_t alpha,
orcus::spreadsheet::color_elem_t red,
orcus::spreadsheet::color_elem_t green,
orcus::spreadsheet::color_elem_t blue);
virtual size_t commit_border();
// cell protection
......@@ -151,7 +165,9 @@ public:
virtual size_t commit_cell_protection();
// number format
virtual void set_number_format(const char* s, size_t n);
virtual void set_number_format_count(size_t n);
virtual void set_number_format_identifier(size_t n);
virtual void set_number_format_code(const char* s, size_t n);
virtual size_t commit_number_format();
// cell style xf
......@@ -172,6 +188,9 @@ public:
virtual void set_xf_border(size_t index);
virtual void set_xf_protection(size_t index);
virtual void set_xf_style_xf(size_t index);
virtual void set_xf_apply_alignment(bool b);
virtual void set_xf_horizontal_alignment(orcus::spreadsheet::hor_alignment_t align);
virtual void set_xf_vertical_alignment(orcus::spreadsheet::ver_alignment_t align);
// cell style entry
......@@ -215,6 +234,7 @@ public:
virtual orcus::spreadsheet::iface::import_sheet* append_sheet(const char *sheet_name, size_t sheet_name_length);
virtual orcus::spreadsheet::iface::import_sheet* get_sheet(const char *sheet_name, size_t sheet_name_length);
virtual orcus::spreadsheet::iface::import_sheet* get_sheet(orcus::spreadsheet::sheet_t sheet_index);
virtual orcus::spreadsheet::iface::import_global_settings* get_global_settings();
virtual orcus::spreadsheet::iface::import_shared_strings* get_shared_strings();
virtual orcus::spreadsheet::iface::import_styles* get_styles();
......
sc/source/filter/orcus/interface.cxx
Dosyayı görüntüle @ 36788e95
......@@ -86,6 +86,23 @@ orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::get_sheet(const char* s
return &maSheets.back();
}
orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::get_sheet(orcus::spreadsheet::sheet_t sheet_index)
{
SCTAB nTab = static_cast<SCTAB>(sheet_index);
// See if we already have an orcus sheet instance by that index.
boost::ptr_vector<ScOrcusSheet>::iterator it =
std::find_if(maSheets.begin(), maSheets.end(), FindSheetByIndex(nTab));
if (it != maSheets.end())
// We already have one. Return it.
return &(*it);
// Create a new orcus sheet instance for this.
maSheets.push_back(new ScOrcusSheet(maDoc, nTab, *this));
return &maSheets.back();
}
orcus::spreadsheet::iface::import_global_settings* ScOrcusFactory::get_global_settings()
{
return &maGlobalSettings;
......@@ -367,6 +384,10 @@ size_t ScOrcusSharedStrings::add(const char* s, size_t n)
return mrFactory.addString(aNewString);
}
void ScOrcusSharedStrings::set_segment_font(size_t /*font_index*/)
{
}
void ScOrcusSharedStrings::set_segment_bold(bool /*b*/)
{
}
......@@ -383,6 +404,13 @@ void ScOrcusSharedStrings::set_segment_font_size(double /*point*/)
{
}
void ScOrcusSharedStrings::set_segment_font_color(orcus::spreadsheet::color_elem_t alpha,
orcus::spreadsheet::color_elem_t red,
orcus::spreadsheet::color_elem_t green,
orcus::spreadsheet::color_elem_t blue)
{
}
void ScOrcusSharedStrings::append_segment(const char* s, size_t n)
{
maCurSegment.append(s, n);
......@@ -419,6 +447,13 @@ void ScOrcusStyles::set_font_underline(orcus::spreadsheet::underline_t /*e*/)
{
}
void ScOrcusStyles::set_font_color(orcus::spreadsheet::color_elem_t alpha,
orcus::spreadsheet::color_elem_t red,
orcus::spreadsheet::color_elem_t green,
orcus::spreadsheet::color_elem_t blue)
{
}
size_t ScOrcusStyles::commit_font()
{
return 0;
......@@ -462,6 +497,15 @@ void ScOrcusStyles::set_border_style(orcus::spreadsheet::border_direction_t /*di
// implement later
}
void ScOrcusStyles::set_border_color(orcus::spreadsheet::border_direction_t /*dir*/,
orcus::spreadsheet::color_elem_t alpha,
orcus::spreadsheet::color_elem_t red,
orcus::spreadsheet::color_elem_t green,
orcus::spreadsheet::color_elem_t blue)
{
// implement later
}
size_t ScOrcusStyles::commit_border()
{
return 0;
......@@ -482,7 +526,15 @@ size_t ScOrcusStyles::commit_cell_protection()
return 0;
}
void ScOrcusStyles::set_number_format(const char* /*s*/, size_t /*n*/)
void ScOrcusStyles::set_number_format_count(size_t)
{
}
void ScOrcusStyles::set_number_format_identifier(size_t)
{
}
void ScOrcusStyles::set_number_format_code(const char* /*s*/, size_t /*n*/)
{
}
......@@ -544,6 +596,18 @@ void ScOrcusStyles::set_xf_style_xf(size_t /*index*/)
{
}
void ScOrcusStyles::set_xf_apply_alignment(bool /*b*/)
{
}
void ScOrcusStyles::set_xf_horizontal_alignment(orcus::spreadsheet::hor_alignment_t /*align*/)
{
}
void ScOrcusStyles::set_xf_vertical_alignment(orcus::spreadsheet::ver_alignment_t /*align*/)
{
}
// cell style entry
// not needed for now for gnumeric
......
sc/source/ui/docshell/datastream.cxx
Dosyayı görüntüle @ 36788e95
......@@ -135,7 +135,7 @@ class ReaderThread : public salhelper::Thread
osl::Condition maCondConsume;
#if ENABLE_ORCUS
orcus::csv_parser_config maConfig;
orcus::csv::parser_config maConfig;
#endif
public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment