[Libreoffice-commits] core.git: external/libabw

2017-10-28 Thread David Tardon 
 external/libabw/ExternalProject_libabw.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8f6ce24a1b51dde676d72132aeebe557cf1186b9
Author: David Tardon 
Date:   Sat Oct 28 10:47:22 2017 +0200

libabw: pass optimization flags to configure

Change-Id: I9492a4189b939f3dcaaec33f9c4591cb8715fd44
Reviewed-on: https://gerrit.libreoffice.org/43977
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/external/libabw/ExternalProject_libabw.mk 
b/external/libabw/ExternalProject_libabw.mk
index 432f035ce285..d8e4d112ea35 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -34,7 +34,8 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-werror \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
-   CXXFLAGS="$(CXXFLAGS) $(BOOST_CPPFLAGS) \
+   CXXFLAGS="$(gb_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
+   CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS) \
-DBOOST_ERROR_CODE_HEADER_ONLY 
-DBOOST_SYSTEM_NO_DEPRECATED" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(MAKE) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libabw

2017-08-09 Thread Stephan Bergmann 
 external/libabw/ExternalProject_libabw.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d500b2e98c15adef6d89900bbb1490065e10cd6e
Author: Stephan Bergmann 
Date:   Wed Aug 9 10:13:43 2017 +0200

Pass ENABLE_DEBUG into external/libabw

Change-Id: Idfccfe7b569622981c8d9911a60bfb749797b359

diff --git a/external/libabw/ExternalProject_libabw.mk 
b/external/libabw/ExternalProject_libabw.mk
index e174f9edebf1..432f035ce285 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
--disable-shared \
--without-docs \
--disable-tools \
-   --disable-debug \
+   $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-werror \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(CXXFLAGS) $(BOOST_CPPFLAGS) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libabw external/libcdr external/libebook external/libmspub external/libmwaw external/libodfgen external/libpagemaker external/librevenge external/libvisio exte

2015-09-17 Thread David Tardon 
 external/libabw/ExternalProject_libabw.mk |2 +-
 external/libcdr/ExternalProject_libcdr.mk |2 +-
 external/libebook/ExternalProject_libebook.mk |2 +-
 external/libmspub/ExternalProject_libmspub.mk |2 +-
 external/libmwaw/ExternalProject_libmwaw.mk   |2 +-
 external/libodfgen/ExternalProject_libodfgen.mk   |2 +-
 external/libpagemaker/ExternalProject_libpagemaker.mk |2 +-
 external/librevenge/ExternalProject_librevenge.mk |2 +-
 external/libvisio/ExternalProject_libvisio.mk |2 +-
 external/libwps/ExternalProject_libwps.mk |2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit f5d753201d3e2464b2a750de46ca2cfb8cc7a4a7
Author: David Tardon 
Date:   Thu Sep 17 20:01:30 2015 +0200

blind attempt to fix lcov

Change-Id: If8d6c8da1be1e540d641f20ac90e7877feae27be

diff --git a/external/libabw/ExternalProject_libabw.mk 
b/external/libabw/ExternalProject_libabw.mk
index 980aada..f2369c2 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
--disable-debug \
--disable-werror \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
-   CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
+   CXXFLAGS="$(CXXFLAGS) $(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
-I$(call gb_UnpackedTarball_get_dir,boost)) \
-DBOOST_ERROR_CODE_HEADER_ONLY 
-DBOOST_SYSTEM_NO_DEPRECATED" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
diff --git a/external/libcdr/ExternalProject_libcdr.mk 
b/external/libcdr/ExternalProject_libcdr.mk
index 96930fe..4686f5c 100644
--- a/external/libcdr/ExternalProject_libcdr.mk
+++ b/external/libcdr/ExternalProject_libcdr.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
--disable-werror \
--disable-weffc \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
-   CXXFLAGS="$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+   CXXFLAGS="$(CXXFLAGS) $(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
-DBOOST_ERROR_CODE_HEADER_ONLY 
-DBOOST_SYSTEM_NO_DEPRECATED" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(MAKE) \
diff --git a/external/libebook/ExternalProject_libebook.mk 
b/external/libebook/ExternalProject_libebook.mk
index 7fced59..5ef585a 100644
--- a/external/libebook/ExternalProject_libebook.mk
+++ b/external/libebook/ExternalProject_libebook.mk
@@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
--disable-werror \
--disable-weffc \
-   CXXFLAGS="$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+   CXXFLAGS="$(CXXFLAGS) $(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
-DBOOST_ERROR_CODE_HEADER_ONLY 
-DBOOST_SYSTEM_NO_DEPRECATED" \
XML_CFLAGS="$(LIBXML_CFLAGS)" \
XML_LIBS="$(LIBXML_LIBS)" \
diff --git a/external/libmspub/ExternalProject_libmspub.mk 
b/external/libmspub/ExternalProject_libmspub.mk
index bf21036..c200ba3 100644
--- a/external/libmspub/ExternalProject_libmspub.mk
+++ b/external/libmspub/ExternalProject_libmspub.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
--disable-werror \
--disable-weffc \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
-   CXXFLAGS="$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+   CXXFLAGS="$(CXXFLAGS) $(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
-DBOOST_ERROR_CODE_HEADER_ONLY 
-DBOOST_SYSTEM_NO_DEPRECATED" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(MAKE) \
diff --git a/external/libmwaw/ExternalProject_libmwaw.mk 
b/external/libmwaw/ExternalProject_libmwaw.mk
index 5fa97ca..2e9f91b 100644
--- a/external/libmwaw/ExternalProject_libmwaw.mk
+++ b/external/libmwaw/ExternalProject_libmwaw.mk
@@ -36,7 +36,7 @@ $(call

[Libreoffice-commits] core.git: external/libabw external/libcdr external/libebook external/libmspub external/libmwaw external/libodfgen external/libpagemaker external/librevenge external/libvisio sole

2015-02-27 Thread Stephan Bergmann 
 external/libabw/UnpackedTarball_libabw.mk |   10 ++
 external/libabw/ubsan-visibility.patch|   11 +++
 external/libcdr/UnpackedTarball_libcdr.mk |   10 ++
 external/libcdr/ubsan-visibility.patch|   11 +++
 external/libebook/UnpackedTarball_libebook.mk |8 
 external/libebook/ubsan-visibility.patch  |   11 +++
 external/libmspub/UnpackedTarball_libmspub.mk |8 
 external/libmspub/ubsan-visibility.patch  |   11 +++
 external/libmwaw/UnpackedTarball_libmwaw.mk   |8 
 external/libmwaw/ubsan-visibility.patch.0 |   11 +++
 external/libodfgen/UnpackedTarball_libodfgen.mk   |8 
 external/libodfgen/ubsan-visibility.patch |   11 +++
 external/libpagemaker/UnpackedTarball_libpagemaker.mk |   10 ++
 external/libpagemaker/ubsan-visibility.patch  |   11 +++
 external/librevenge/UnpackedTarball_librevenge.mk |   10 +-
 external/librevenge/ubsan-visibility.patch|   11 +++
 external/libvisio/UnpackedTarball_libvisio.mk |8 
 external/libvisio/ubsan-visibility.patch  |   11 +++
 solenv/gbuild/platform/com_GCC_defs.mk|8 +++-
 19 files changed, 185 insertions(+), 2 deletions(-)

New commits:
commit f0aa1a78fb209310e8baef53c02f365fca518d11
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 27 10:05:22 2015 +0100

For Clang -fsanitize=vptr use -fvisibility-ms-compat, not 
-fvisibility=hidden

As discussed in b4f6b26b5a1a78fecfa95ec2eb7ac8b80495d8aa 
SAL_DLLPUBLIC_RTTI for
proper RTTI visibility for LLVM, RTTI-based -fsanitize= checks with Clang 
on
Linux need special precautions to make RTTI symbols visible across DSOs.  
The
approach taken there, as well as in 598d8194b0ea1a64e0ebba28a86c128bafa57c7c
Visible function type RTTI for Clang -fsanitize=function, was to add 
explicit
SAL_DLLPUBLIC_RTTI annontations to relevant type definitions.  However, for
-fsanitize=vptr that would have required many more of those, so it appears
easier to misuse -fsanitize-ms-compat in that case, which happens to give 
all
RTTI symbols default visibility (while otherwise still honoring our
SAL_DLLPUBLIC/PRIVATE annotations).

The SAL_DLLPUBLIC_RTTI annotations from 
598d8194b0ea1a64e0ebba28a86c128bafa57c7c
Visible function type RTTI for Clang -fsanitize=function can likely be 
removed
again.

Change-Id: Ibeff7ab8c908111a7dc66ff0677204f112b24db8

diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index 6288b0e..eb6b75c 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -11,4 +11,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libabw))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libabw,0))
+
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifneq ($(filter -fsanitize=%,$(CC)),)
+$(eval $(call gb_UnpackedTarball_add_patches,libabw, \
+external/libabw/ubsan-visibility.patch \
+))
+endif
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/ubsan-visibility.patch 
b/external/libabw/ubsan-visibility.patch
new file mode 100644
index 000..2285ef8
--- /dev/null
+++ b/external/libabw/ubsan-visibility.patch
@@ -0,0 +1,11 @@
+--- configure
 configure
+@@ -16635,7 +16635,7 @@
+ { $as_echo $as_me:${as_lineno-$LINENO}: checking for 
-fvisibility=hidden compiler flag 5
+ $as_echo_n checking for -fvisibility=hidden compiler flag...  6; }
+ saved_CXXFLAGS=$CXXFLAGS
+-CXXFLAGS=$CXXFLAGS -fvisibility=hidden
++CXXFLAGS=$CXXFLAGS -fvisibility-ms-compat
+ cat confdefs.h - _ACEOF conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk 
b/external/libcdr/UnpackedTarball_libcdr.mk
index a91bc8e..f43bd1b 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -11,4 +11,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libcdr))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,0))
+
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifneq ($(filter -fsanitize=%,$(CC)),)
+$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
+external/libcdr/ubsan-visibility.patch \
+))
+endif
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libcdr/ubsan-visibility.patch 
b/external/libcdr/ubsan-visibility.patch
new file mode 100644
index 000..2581786
--- /dev/null
+++ b/external/libcdr/ubsan-visibility.patch
@@ -0,0 +1,11 @@
+--- configure
 configure
+@@ -17651,7 +17641,7 @@
+ { $as_echo $as_me:${as_lineno-$LINENO}: checking for

[Libreoffice-commits] core.git: external/libabw

2014-01-23 Thread Fridrich Štrba 
 external/libabw/UnpackedTarball_libabw.mk |1 
 external/libabw/libabw-0.0.1-badtable.patch.1 |  100 ++
 2 files changed, 101 insertions(+)

New commits:
commit 6f52d472393e4d92c0a4d988f28312edaeb5775c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jan 23 17:12:35 2014 +0100

Don't crash on unstarted table

Change-Id: I68e596ea37133c89206333e8ca8aa3602878d2fc

diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index 4f8b440..8e28755 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -14,6 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
 $(eval $(call gb_UnpackedTarball_add_patches,libabw,\
external/libabw/libabw-0.0.1-inttypes.patch.1 \
external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 \
+   external/libabw/libabw-0.0.1-badtable.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/libabw-0.0.1-badtable.patch.1 
b/external/libabw/libabw-0.0.1-badtable.patch.1
new file mode 100644
index 000..ddb0c8f
--- /dev/null
+++ b/external/libabw/libabw-0.0.1-badtable.patch.1
@@ -0,0 +1,100 @@
+--- a/src/lib/ABWContentCollector.cpp
 b/src/lib/ABWContentCollector.cpp
+@@ -1492,26 +1492,32 @@ void libabw::ABWContentCollector::closeTable()
+ 
+ void libabw::ABWContentCollector::openCell(const char *props)
+ {
+-  if (props)
+-parsePropString(props, m_ps-m_tableStates.top().m_currentCellProperties);
+-  int currentRow(0);
+-  if (!findInt(_findCellProperty(top-attach), currentRow))
+-currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
+-  while (m_ps-m_tableStates.top().m_currentTableRow  currentRow)
++  if (!m_ps-m_tableStates.empty())
+   {
+-if (m_ps-m_tableStates.top().m_currentTableRow = 0)
+-  _closeTableRow();
+-_openTableRow();
+-  }
++if (props)
++  parsePropString(props, 
m_ps-m_tableStates.top().m_currentCellProperties);
++int currentRow(0);
++if (!findInt(_findCellProperty(top-attach), currentRow))
++  currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
++while (m_ps-m_tableStates.top().m_currentTableRow  currentRow)
++{
++  if (m_ps-m_tableStates.top().m_currentTableRow = 0)
++_closeTableRow();
++  _openTableRow();
++}
+ 
+-  if (!findInt(_findCellProperty(left-attach), 
m_ps-m_tableStates.top().m_currentTableCol))
+-m_ps-m_tableStates.top().m_currentTableCol++;
++if (!findInt(_findCellProperty(left-attach), 
m_ps-m_tableStates.top().m_currentTableCol))
++  m_ps-m_tableStates.top().m_currentTableCol++;
++  }
+ }
+ 
+ void libabw::ABWContentCollector::closeCell()
+ {
+-  _closeTableCell();
+-  m_ps-m_tableStates.top().m_currentCellProperties.clear();
++  if (!m_ps-m_tableStates.empty())
++  {
++_closeTableCell();
++m_ps-m_tableStates.top().m_currentCellProperties.clear();
++  }
+ }
+ 
+ void libabw::ABWContentCollector::collectData(const char *, const char *, 
const WPXBinaryData )
+--- a/src/lib/ABWStylesCollector.cpp
 b/src/lib/ABWStylesCollector.cpp
+@@ -167,28 +167,32 @@ void libabw::ABWStylesCollector::closeTable()
+ 
+ void libabw::ABWStylesCollector::openCell(const char *props)
+ {
+-  if (props)
+-parsePropString(props, m_ps-m_tableStates.top().m_currentCellProperties);
+-  int currentRow(0);
+-  if (!findInt(_findCellProperty(top-attach), currentRow))
+-currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
+-  while (m_ps-m_tableStates.top().m_currentTableRow  currentRow)
+-m_ps-m_tableStates.top().m_currentTableRow++;
+-
+-  if (!m_ps-m_tableStates.empty()  0 == 
m_ps-m_tableStates.top().m_currentTableRow)
++  if (!m_ps-m_tableStates.empty())
+   {
+-int leftAttach(0);
+-int rightAttach(0);
+-if (findInt(_findCellProperty(left-attach), leftAttach)  
findInt(_findCellProperty(right-attach), rightAttach))
+-  m_ps-m_tableStates.top().m_currentTableWidth += rightAttach - 
leftAttach;
+-else
+-  m_ps-m_tableStates.top().m_currentTableWidth++;
++if (props)
++  parsePropString(props, 
m_ps-m_tableStates.top().m_currentCellProperties);
++int currentRow(0);
++if (!findInt(_findCellProperty(top-attach), currentRow))
++  currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
++while (m_ps-m_tableStates.top().m_currentTableRow  currentRow)
++  m_ps-m_tableStates.top().m_currentTableRow++;
++
++if (0 == m_ps-m_tableStates.top().m_currentTableRow)
++{
++  int leftAttach(0);
++  int rightAttach(0);
++  if (findInt(_findCellProperty(left-attach), leftAttach)  
findInt(_findCellProperty(right-attach), rightAttach))
++m_ps-m_tableStates.top().m_currentTableWidth += rightAttach - 
leftAttach;
++  else
++m_ps-m_tableStates.top().m_currentTableWidth++;
++}
+   }
+ }
+ 
+ void libabw::ABWStylesCollector::closeCell()
+ {
+-

[Libreoffice-commits] core.git: external/libabw

2014-01-20 Thread Fridrich Štrba 
 external/libabw/UnpackedTarball_libabw.mk  |1 +
 external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 7989850e9fc5fb2fb757ecf388b51bc3e96a0267
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jan 21 08:44:45 2014 +0100

Coverity: Potential crash (?)

Change-Id: I819b0df446cf95d511d6a7a5a65c381a2a837d00

diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index c61f2d5..4f8b440 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libabw,\
external/libabw/libabw-0.0.1-inttypes.patch.1 \
+   external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 
b/external/libabw/libabw-0.0.1-stdstringfromnull.patch.1
new file mode 100644
index 000..fccaa8e
--- /dev/null
+++ b/external/libabw/libabw-0.0.1-stdstringfromnull.patch.1
@@ -0,0 +1,11 @@
+--- a/src/lib/ABWContentCollector.cpp
 b/src/lib/ABWContentCollector.cpp
+@@ -643,7 +643,7 @@ void 
libabw::ABWContentCollector::collectHeaderFooter(const char *id, const char
+   if (!type)
+ m_ps-m_currentHeaderFooterId = -1;
+ 
+-  std::string sType(type);
++  std::string sType(type ? type : );
+   boost::trim(sType);
+   std::vectorstd::string strVec;
+   boost::algorithm::split(strVec, sType, boost::is_any_of(-), 
boost::token_compress_on);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libabw

2014-01-16 Thread Fridrich Štrba 
 external/libabw/UnpackedTarball_libabw.mk |4 ++
 external/libabw/libabw-0.0.1-inttypes.patch.1 |   36 ++
 2 files changed, 40 insertions(+)

New commits:
commit 9c46e4069db51ab0fc8b3e197d27b5f947a3fdeb
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jan 16 18:20:09 2014 +0100

No need to use the stuff from inttypes here

Change-Id: I8d80a8ff223d7c57f7efe808e07ac31aa4d521fd

diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index 6288b0e..c61f2d5 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libabw))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libabw,\
+   external/libabw/libabw-0.0.1-inttypes.patch.1 \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/libabw-0.0.1-inttypes.patch.1 
b/external/libabw/libabw-0.0.1-inttypes.patch.1
new file mode 100644
index 000..7c13690
--- /dev/null
+++ b/external/libabw/libabw-0.0.1-inttypes.patch.1
@@ -0,0 +1,36 @@
+diff --git a/src/lib/ABWStylesCollector.cpp b/src/lib/ABWStylesCollector.cpp
+index e422b6d..beb4cb9 100644
+--- a/src/lib/ABWStylesCollector.cpp
 b/src/lib/ABWStylesCollector.cpp
+@@ -49,10 +49,10 @@ enum ABWListType
+   NOT_A_LIST = 0xff
+ };
+ 
+-static int abw_unichar_to_utf8(uint32_t c, char *outbuf)
++static int abw_unichar_to_utf8(unsigned c, char *outbuf)
+ {
+-  uint8_t len = 1;
+-  uint8_t first = 0;
++  unsigned char len = 1;
++  unsigned char first = 0;
+ 
+   if (c  0x80)
+   {
+@@ -87,7 +87,7 @@ static int abw_unichar_to_utf8(uint32_t c, char *outbuf)
+ 
+   if (outbuf)
+   {
+-for (uint8_t i = (uint8_t)(len - 1); i  0; --i)
++for (unsigned char i = (unsigned char)(len - 1); i  0; --i)
+ {
+   outbuf[i] = (char)((c  0x3f) | 0x80);
+   c = 6;
+@@ -98,7 +98,7 @@ static int abw_unichar_to_utf8(uint32_t c, char *outbuf)
+   return len;
+ }
+ 
+-static void appendUCS4(WPXString str, uint32_t ucs4)
++static void appendUCS4(WPXString str, unsigned ucs4)
+ {
+   int charLength = abw_unichar_to_utf8(ucs4, 0);
+   char *utf8 = new char[charLength+1];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libabw

2014-01-14 Thread Fridrich Štrba 
 external/libabw/UnpackedTarball_libabw.mk|4 
 external/libabw/libabw-0.0.0-footendnote.patch.1 |  101 +++
 2 files changed, 105 insertions(+)

New commits:
commit 766f718ebb4deda1a294cc1cfe137a75dfb0f6f8
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jan 14 08:57:35 2014 +0100

Fix a silly with ABW footnotes/endnotes

Change-Id: I026f9c664ff7dec51e511ad439ab563d2cc0c201

diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index 6288b0e..8a565fb 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libabw))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libabw,\
+   external/libabw/libabw-0.0.0-footendnote.patch.1 \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/libabw-0.0.0-footendnote.patch.1 
b/external/libabw/libabw-0.0.0-footendnote.patch.1
new file mode 100644
index 000..4c9e813
--- /dev/null
+++ b/external/libabw/libabw-0.0.0-footendnote.patch.1
@@ -0,0 +1,101 @@
+--- a/src/lib/ABWContentCollector.cpp
 b/src/lib/ABWContentCollector.cpp
+@@ -289,6 +289,7 @@ libabw::ABWContentParsingState::ABWContentParsingState() :
+   m_isSpanOpened(false),
+   m_isParagraphOpened(false),
+   m_isListElementOpened(false),
++  m_inParagraphOrListElement(false),
+ 
+   m_currentSectionStyle(),
+   m_currentParagraphStyle(),
+@@ -334,6 +335,7 @@ 
libabw::ABWContentParsingState::ABWContentParsingState(const ABWContentParsingSt
+   m_isSpanOpened(ps.m_isSpanOpened),
+   m_isParagraphOpened(ps.m_isParagraphOpened),
+   m_isListElementOpened(ps.m_isListElementOpened),
++  m_inParagraphOrListElement(ps.m_inParagraphOrListElement),
+ 
+   m_currentSectionStyle(ps.m_currentSectionStyle),
+   m_currentParagraphStyle(ps.m_currentParagraphStyle),
+@@ -500,6 +502,7 @@ void 
libabw::ABWContentCollector::collectParagraphProperties(const char *level,
+ parsePropString(props, tmpProps);
+   for (std::mapstd::string, std::string::const_iterator iter = 
tmpProps.begin(); iter != tmpProps.end(); ++iter)
+ m_ps-m_currentParagraphStyle[iter-first] = iter-second;
++  m_ps-m_inParagraphOrListElement = true;
+ }
+ 
+ void libabw::ABWContentCollector::collectCharacterProperties(const char 
*style, const char *props)
+@@ -748,6 +751,7 @@ void 
libabw::ABWContentCollector::closeParagraphOrListElement()
+   _closeParagraph();
+   _closeListElement();
+   m_ps-m_currentParagraphStyle.clear();
++  m_ps-m_inParagraphOrListElement = false;
+ }
+ 
+ void libabw::ABWContentCollector::openLink(const char *href)
+@@ -807,6 +811,8 @@ void libabw::ABWContentCollector::insertPageBreak()
+ 
+ void libabw::ABWContentCollector::insertText(const WPXString text)
+ {
++  if (!m_ps-m_inParagraphOrListElement)
++return;
+   if (!m_ps-m_isSpanOpened)
+ _openSpan();
+ 
+--- a/src/lib/ABWContentCollector.h
 b/src/lib/ABWContentCollector.h
+@@ -71,6 +71,7 @@ struct ABWContentParsingState
+   bool m_isSpanOpened;
+   bool m_isParagraphOpened;
+   bool m_isListElementOpened;
++  bool m_inParagraphOrListElement;
+ 
+   std::mapstd::string, std::string m_currentSectionStyle;
+   std::mapstd::string, std::string m_currentParagraphStyle;
+--- a/src/lib/ABWParser.cpp
 b/src/lib/ABWParser.cpp
+@@ -92,7 +92,7 @@ void appendFromBase64(WPXBinaryData data, const char 
*base64Data)
+ } // namespace libabw
+ 
+ libabw::ABWParser::ABWParser(WPXInputStream *input, WPXDocumentInterface 
*iface)
+-  : m_input(input), m_iface(iface), m_collector(0), m_inParagraph(false)
++  : m_input(input), m_iface(iface), m_collector(0)
+ {
+ }
+ 
+@@ -173,8 +173,7 @@ void libabw::ABWParser::processXmlNode(xmlTextReaderPtr 
reader)
+   {
+ WPXString text((const char *)xmlTextReaderConstValue(reader));
+ ABW_DEBUG_MSG((ABWParser::processXmlNode: text %s\n, text.cstr()));
+-if (m_inParagraph  m_collector)
+-  m_collector-insertText(text);
++m_collector-insertText(text);
+   }
+   switch (tokenId)
+   {
+@@ -219,16 +218,10 @@ void libabw::ABWParser::processXmlNode(xmlTextReaderPtr 
reader)
+ break;
+   case XML_P:
+ if (XML_READER_TYPE_ELEMENT == tokenType)
+-{
+   readP(reader);
+-  m_inParagraph = true;
+-}
+ if (XML_READER_TYPE_END_ELEMENT == tokenType || emptyToken  0)
+-{
+-  m_inParagraph = false;
+   if (m_collector)
+ m_collector-closeParagraphOrListElement();
+-}
+ break;
+   case XML_C:
+ if (XML_READER_TYPE_ELEMENT == tokenType)
+--- a/src/lib/ABWParser.h
 b/src/lib/ABWParser.h
+@@ -61,7 +61,6 @@ private:
+   WPXInputStream *m_input;
+   WPXDocumentInterface *m_iface;
+   ABWCollector *m_collector;
+-  bool m_inParagraph;
+ };
+ 
+ } // namespace libabw
___
Libreoffice-commits mailing list

[Libreoffice-commits] core.git: external/libabw

2014-01-14 Thread Fridrich Štrba 
 external/libabw/UnpackedTarball_libabw.mk  |1 
 external/libabw/libabw-0.0.0-listshape.patch.1 |   67 +
 2 files changed, 68 insertions(+)

New commits:
commit f8bf3e3cd4b55099a1427d611af06a45460034e7
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jan 14 09:40:13 2014 +0100

Fix ABW list shapes

Change-Id: Ibbbfddf10677e8c5b654cee9c5fda1603a298a67

diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index 8a565fb..d6b72e1 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libabw,\
external/libabw/libabw-0.0.0-footendnote.patch.1 \
+   external/libabw/libabw-0.0.0-listshape.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/libabw-0.0.0-listshape.patch.1 
b/external/libabw/libabw-0.0.0-listshape.patch.1
new file mode 100644
index 000..f0e2525
--- /dev/null
+++ b/external/libabw/libabw-0.0.0-listshape.patch.1
@@ -0,0 +1,67 @@
+--- a/src/lib/ABWContentCollector.cpp
 b/src/lib/ABWContentCollector.cpp
+@@ -928,7 +928,8 @@ void libabw::ABWContentCollector::_openHeader()
+   m_ps-m_isHeaderOpened = true;
+ }
+ 
+-void libabw::ABWContentCollector::_fillParagraphProperties(WPXPropertyList 
propList, WPXPropertyListVector tabStops)
++void libabw::ABWContentCollector::_fillParagraphProperties(WPXPropertyList 
propList, WPXPropertyListVector tabStops,
++   bool isListElement)
+ {
+   ABWUnit unit(ABW_NONE);
+   double value(0.0);
+@@ -937,17 +938,20 @@ void 
libabw::ABWContentCollector::_fillParagraphProperties(WPXPropertyList prop
+   if (findDouble(_findParagraphProperty(margin-right), value, unit)  unit 
== ABW_IN)
+ propList.insert(fo:margin-right, value);
+ 
+-  if (findDouble(_findParagraphProperty(margin-left), value, unit)  unit 
== ABW_IN)
+-propList.insert(fo:margin-left, value);
+-
+   if (findDouble(_findParagraphProperty(margin-top), value, unit)  unit 
== ABW_IN)
+ propList.insert(fo:margin-top, value);
+ 
+   if (findDouble(_findParagraphProperty(margin-bottom), value, unit)  
unit == ABW_IN)
+ propList.insert(fo:margin-bottom, value);
+ 
+-  if (findDouble(_findParagraphProperty(text-indent), value, unit)  unit 
== ABW_IN)
+-propList.insert(fo:text-indent, value);
++  if (!isListElement)
++  {
++if (findDouble(_findParagraphProperty(margin-left), value, unit)  
unit == ABW_IN)
++  propList.insert(fo:margin-left, value);
++
++if (findDouble(_findParagraphProperty(text-indent), value, unit)  
unit == ABW_IN)
++  propList.insert(fo:text-indent, value);
++  }
+ 
+   std::string sValue = _findParagraphProperty(text-align);
+   if (!sValue.empty())
+@@ -1029,7 +1033,7 @@ void libabw::ABWContentCollector::_openParagraph()
+ 
+ WPXPropertyList propList;
+ WPXPropertyListVector tabStops;
+-_fillParagraphProperties(propList, tabStops);
++_fillParagraphProperties(propList, tabStops, false);
+ 
+ m_ps-m_deferredPageBreak = false;
+ m_ps-m_deferredColumnBreak = false;
+@@ -1070,7 +1074,7 @@ void libabw::ABWContentCollector::_openListElement()
+ 
+ WPXPropertyList propList;
+ WPXPropertyListVector tabStops;
+-_fillParagraphProperties(propList, tabStops);
++_fillParagraphProperties(propList, tabStops, true);
+ 
+ m_outputElements.addOpenListElement(propList, tabStops);
+ 
+--- a/src/lib/ABWContentCollector.h
 b/src/lib/ABWContentCollector.h
+@@ -194,7 +194,7 @@ private:
+   std::string _findCellProperty(const char *name);
+   std::string _findSectionProperty(const char *name);
+ 
+-  void _fillParagraphProperties(WPXPropertyList propList, 
WPXPropertyListVector tabStops);
++  void _fillParagraphProperties(WPXPropertyList propList, 
WPXPropertyListVector tabStops, bool isListElement);
+ 
+   ABWContentParsingState *m_ps;
+   WPXDocumentInterface *m_iface;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libabw

2014-01-14 Thread Fridrich Štrba 
 external/libabw/UnpackedTarball_libabw.mk |1 +
 external/libabw/libabw-0.0.0-mimetype.patch.1 |   13 +
 2 files changed, 14 insertions(+)

New commits:
commit 7c3ca696543d0e9d6771d53f386086086d8b8643
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jan 14 11:28:57 2014 +0100

Fix ABW embedded images

Change-Id: Ifd33ea9c1f91865d5ae5175eefa9b65107404bf0

diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index d6b72e1..843100c 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -14,6 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
 $(eval $(call gb_UnpackedTarball_add_patches,libabw,\
external/libabw/libabw-0.0.0-footendnote.patch.1 \
external/libabw/libabw-0.0.0-listshape.patch.1 \
+   external/libabw/libabw-0.0.0-mimetype.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/libabw-0.0.0-mimetype.patch.1 
b/external/libabw/libabw-0.0.0-mimetype.patch.1
new file mode 100644
index 000..3856e31
--- /dev/null
+++ b/external/libabw/libabw-0.0.0-mimetype.patch.1
@@ -0,0 +1,13 @@
+diff --git a/src/lib/ABWContentCollector.cpp b/src/lib/ABWContentCollector.cpp
+index 53b8d81..14dd840 100644
+--- a/src/lib/ABWContentCollector.cpp
 b/src/lib/ABWContentCollector.cpp
+@@ -1537,7 +1537,7 @@ void libabw::ABWContentCollector::insertImage(const char 
*dataid, const char *pr
+   m_outputElements.addOpenFrame(propList);
+ 
+   propList.clear();
+-  propList.insert(libwpd:mime-type, iter-second.m_mimeType);
++  propList.insert(libwpd:mimetype, iter-second.m_mimeType);
+ 
+   m_outputElements.addInsertBinaryObject(propList, 
iter-second.m_binaryData);
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits