diff options
author | David Tardon <dtardon@redhat.com> | 2014-02-10 16:05:56 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-02-10 16:12:50 +0100 |
commit | baa84c47a1637898560162ef5d24530eef81b10d (patch) | |
tree | 4ee45e16d08ed04fc07dad78f910dcaf3762d1eb /external | |
parent | TiledLibreOffice needs css_comp_uui_UUIInteractionHandler_get_implementation (diff) | |
download | core-baa84c47a1637898560162ef5d24530eef81b10d.tar.gz core-baa84c47a1637898560162ef5d24530eef81b10d.zip |
upload libabw 0.0.2
Change-Id: I2b73c5546e767030344f787efb9a9cafa9635ad3
Diffstat (limited to 'external')
-rw-r--r-- | external/libabw/UnpackedTarball_libabw.mk | 6 | ||||
-rw-r--r-- | external/libabw/libabw-0.0.1-badtable.patch.1 | 100 | ||||
-rw-r--r-- | external/libabw/libabw-0.0.1-inttypes.patch.1 | 36 | ||||
-rw-r--r-- | external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 | 11 |
4 files changed, 0 insertions, 153 deletions
diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk index 8e28755976c6..6288b0ef83aa 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 ddb0c8f43608..000000000000 --- 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 7c136900a694..000000000000 --- 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 fccaa8ee2173..000000000000 --- 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); |