[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - download.lst external/libabw
David Tardon
dtardon at redhat.com
Mon Feb 10 07:52:45 PST 2014
download.lst | 4
external/libabw/UnpackedTarball_libabw.mk | 6 -
external/libabw/libabw-0.0.1-badtable.patch.1 | 100 -----------------
external/libabw/libabw-0.0.1-inttypes.patch.1 | 36 ------
external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 | 11 -
5 files changed, 2 insertions(+), 155 deletions(-)
New commits:
commit d0f2627feb1a406d423af45dea8b1773aeaa0a82
Author: David Tardon <dtardon at redhat.com>
Date: Mon Feb 10 16:05:56 2014 +0100
upload libabw 0.0.2
Change-Id: I2b73c5546e767030344f787efb9a9cafa9635ad3
(cherry picked from commit baa84c47a1637898560162ef5d24530eef81b10d)
Reviewed-on: https://gerrit.libreoffice.org/7973
Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
diff --git a/download.lst b/download.lst
index 70671bc..1b14652 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-ABW_MD5SUM := af3ccc1f1884e68389088d490d596409
-export ABW_TARBALL := libabw-0.0.1.tar.bz2
+ABW_MD5SUM := 40fa48e03b1e28ae0325cc34b35bc46d
+export ABW_TARBALL := libabw-0.0.2.tar.bz2
CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
export CDR_TARBALL := libcdr-0.0.14.tar.bz2
EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978
diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk
index 8e28755..6288b0e 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -11,10 +11,4 @@ $(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 \
- 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
deleted file mode 100644
index ddb0c8f..0000000
--- a/external/libabw/libabw-0.0.1-badtable.patch.1
+++ /dev/null
@@ -1,100 +0,0 @@
---- 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()
- {
-- m_ps->m_tableStates.top().m_currentCellProperties.clear();
-+ if (!m_ps->m_tableStates.empty())
-+ m_ps->m_tableStates.top().m_currentCellProperties.clear();
- }
-
- std::string libabw::ABWStylesCollector::_findCellProperty(const char *name)
diff --git a/external/libabw/libabw-0.0.1-inttypes.patch.1 b/external/libabw/libabw-0.0.1-inttypes.patch.1
deleted file mode 100644
index 7c13690..0000000
--- a/external/libabw/libabw-0.0.1-inttypes.patch.1
+++ /dev/null
@@ -1,36 +0,0 @@
-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];
diff --git a/external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 b/external/libabw/libabw-0.0.1-stdstringfromnull.patch.1
deleted file mode 100644
index fccaa8e..0000000
--- a/external/libabw/libabw-0.0.1-stdstringfromnull.patch.1
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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::vector<std::string> strVec;
- boost::algorithm::split(strVec, sType, boost::is_any_of("-"), boost::token_compress_on);
More information about the Libreoffice-commits
mailing list