diff options
Diffstat (limited to 'libwps')
| -rw-r--r-- | libwps/libwps-0.1.1.diff | 93 | ||||
| -rw-r--r-- | libwps/libwps-0.2.0.patch | 11 | ||||
| -rw-r--r-- | libwps/libwps-0.2.1-warnings.patch | 60 | ||||
| -rw-r--r-- | libwps/libwps-0.2.1.patch | 28 | ||||
| -rw-r--r-- | libwps/makefile.mk | 6 |
5 files changed, 91 insertions, 107 deletions
diff --git a/libwps/libwps-0.1.1.diff b/libwps/libwps-0.1.1.diff deleted file mode 100644 index 6977cf33ceec..000000000000 --- a/libwps/libwps-0.1.1.diff +++ /dev/null @@ -1,93 +0,0 @@ -*** misc/libwps-0.1.1/src/lib/WPSListener.h Thu Nov 29 20:58:57 2007 ---- misc/build/libwps-0.1.1/src/lib/WPSListener.h Sun Dec 2 20:54:35 2007 -*************** -*** 39,45 **** - virtual ~WPSListener(); - - bool isUndoOn() { return m_isUndoOn; } -! void setUndoOn(bool isUndoOn) { m_isUndoOn = isUndoOn; } - - std::list<WPSPageSpan> &m_pageList; - ---- 39,45 ---- - virtual ~WPSListener(); - - bool isUndoOn() { return m_isUndoOn; } -! void setUndoOn(bool undoOn) { m_isUndoOn = undoOn; } - - std::list<WPSPageSpan> &m_pageList; - -*** misc/libwps-0.1.1/src/lib/WPSContentListener.cpp Thu Nov 29 20:58:57 2007 ---- misc/build/libwps-0.1.1/src/lib/WPSContentListener.cpp Sun Dec 2 21:09:11 2007 -*************** -*** 36,62 **** - #define LIBWPS_MAX std::max - #endif - -- namespace { -- -- WPXString doubleToString(const double value) -- { -- WPXString tempString; -- tempString.sprintf("%.4f", value); -- std::string decimalPoint(localeconv()->decimal_point); -- if ((decimalPoint.size() == 0) || (decimalPoint == ".")) -- return tempString; -- std::string stringValue(tempString.cstr()); -- if (!stringValue.empty()) -- { -- std::string::size_type pos; -- while ((pos = stringValue.find(decimalPoint)) != std::string::npos) -- stringValue.replace(pos,decimalPoint.size(),"."); -- } -- return WPXString(stringValue.c_str()); -- } -- -- } // namespace -- - _WPSContentParsingState::_WPSContentParsingState() : - m_textAttributeBits(0), - m_fontSize(12.0f/*WP6_DEFAULT_FONT_SIZE*/), // FIXME ME!!!!!!!!!!!!!!!!!!! HELP WP6_DEFAULT_FONT_SIZE ---- 36,41 ---- -*************** -*** 578,585 **** - _closePageSpan(); - } - -- const float WPS_DEFAULT_SUPER_SUB_SCRIPT = 58.0f; -- - void WPSContentListener::_openSpan() - { - if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) ---- 557,562 ---- -*************** -*** 622,639 **** - } - - WPXPropertyList propList; -! if (attributeBits & WPS_SUPERSCRIPT_BIT) { -! WPXString sSuperScript("super "); -! sSuperScript.append(doubleToString(WPS_DEFAULT_SUPER_SUB_SCRIPT)); -! sSuperScript.append("%"); -! propList.insert("style:text-position", sSuperScript); -! } -! else if (attributeBits & WPS_SUBSCRIPT_BIT) { -! WPXString sSubScript("sub "); -! sSubScript.append(doubleToString(WPS_DEFAULT_SUPER_SUB_SCRIPT)); -! sSubScript.append("%"); -! propList.insert("style:text-position", sSubScript); -! } - if (attributeBits & WPS_ITALICS_BIT) - propList.insert("fo:font-style", "italic"); - if (attributeBits & WPS_BOLD_BIT) ---- 599,608 ---- - } - - WPXPropertyList propList; -! if (m_ps->m_textAttributeBits & WPS_SUPERSCRIPT_BIT) -! propList.insert("style:text-position", "super 58%"); -! else if (m_ps->m_textAttributeBits & WPS_SUBSCRIPT_BIT) -! propList.insert("style:text-position", "sub 58%"); - if (attributeBits & WPS_ITALICS_BIT) - propList.insert("fo:font-style", "italic"); - if (attributeBits & WPS_BOLD_BIT) diff --git a/libwps/libwps-0.2.0.patch b/libwps/libwps-0.2.0.patch deleted file mode 100644 index 6af2989b70af..000000000000 --- a/libwps/libwps-0.2.0.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up misc/build/libwps-0.2.0/src/lib/libwps_internal.h.old misc/build/libwps-0.2.0/src/lib/libwps_internal.h ---- misc/build/libwps-0.2.0/src/lib/libwps_internal.h.old 2010-11-17 20:47:23.288507198 +0100 -+++ misc/build/libwps-0.2.0/src/lib/libwps_internal.h 2010-11-17 20:47:26.596839807 +0100 -@@ -23,6 +23,7 @@ - #define LIBWPS_INTERNAL_H - #ifdef DEBUG - #include <bitset> -+#include <stdio.h> - #endif - #include <libwpd-stream/libwpd-stream.h> - #include <libwpd/libwpd.h> diff --git a/libwps/libwps-0.2.1-warnings.patch b/libwps/libwps-0.2.1-warnings.patch new file mode 100644 index 000000000000..fffffd52ee80 --- /dev/null +++ b/libwps/libwps-0.2.1-warnings.patch @@ -0,0 +1,60 @@ +--- misc/libwps-0.2.1/src/lib/WPS8.cpp 2011-04-05 11:25:15.000000000 +0200 ++++ misc/build/libwps-0.2.1/src/lib/WPS8.cpp 2011-05-03 15:02:21.107349347 +0200 +@@ -136,7 +136,7 @@ + input->seek(pos->second.offset, WPX_SEEK_SET); + n_streams = readU32(input); + +- if (n_streams > 100) WPS_DEBUG_MSG(("Probably garbled STRS: count = %u\n",n_streams)); ++ if (n_streams > 100) { WPS_DEBUG_MSG(("Probably garbled STRS: count = %u\n",n_streams)); } + + /* skip mysterious header*/ + input->seek(8, WPX_SEEK_CUR); +@@ -155,7 +155,7 @@ + last_pos += offset; + } + offset = readU32(input); +- if (offset) WPS_DEBUG_MSG(("Offset table is not 0-terminated!\n")); ++ if (offset) { WPS_DEBUG_MSG(("Offset table is not 0-terminated!\n")); } + + for (unsigned i=0; i < n_streams; i++) { + uint16_t len; +@@ -325,7 +325,7 @@ + * + */ + +-void WPS8Parser::readText(WPXInputStream * input, WPS8ContentListener *listener) ++void WPS8Parser::readText(WPXInputStream * /* input */, WPS8ContentListener * /* listener */) + { + #if (0) + WPS_DEBUG_MSG(("WPS8Parser::readText()\n")); +@@ -1356,7 +1356,7 @@ + id += 4; + t_rem -= 4; + +- if (t_count < 0 && t_count > 20) break; /* obviously wrong */ ++ if (t_count > 20) break; /* obviously wrong */ + } else break; /* wrong format */ + } + +--- misc/libwps-0.2.1/src/lib/WPSContentListener.cpp 2011-04-04 21:56:29.000000000 +0200 ++++ misc/build/libwps-0.2.1/src/lib/WPSContentListener.cpp 2011-05-03 15:02:21.837414573 +0200 +@@ -621,7 +621,7 @@ + _closeParagraph(); + } + +-const uint16_t WPSContentListener::getSpec() const ++uint16_t WPSContentListener::getSpec() const + { + return m_ps->m_spec; + } +--- misc/libwps-0.2.1/src/lib/WPSContentListener.h 2011-04-04 21:30:56.000000000 +0200 ++++ misc/build/libwps-0.2.1/src/lib/WPSContentListener.h 2011-05-03 15:02:23.334548336 +0200 +@@ -154,7 +154,7 @@ + + void insertEOL(); + +- const uint16_t getSpec() const; ++ uint16_t getSpec() const; + protected: + WPSContentListener(std::list<WPSPageSpan> &pageList, WPXDocumentInterface *documentInterface); + virtual ~WPSContentListener(); diff --git a/libwps/libwps-0.2.1.patch b/libwps/libwps-0.2.1.patch new file mode 100644 index 000000000000..a70812dd568a --- /dev/null +++ b/libwps/libwps-0.2.1.patch @@ -0,0 +1,28 @@ +--- misc/libwps-0.2.1/src/lib/libwps_internal.cpp 2011-04-04 21:53:42.000000000 +0200 ++++ misc/build/libwps-0.2.1/src/lib/libwps_internal.cpp 2011-05-03 14:50:56.146147538 +0200 +@@ -79,18 +79,15 @@ + {0x419,"ru-RU"} + }; + +-static int _ltcomp(const void *k1, const void *k2) +-{ +- int r = (int)((ssize_t)k1) - ((_lange*)k2)->id; +- return r; +-} +- + std::string getLangFromLCID(uint32_t lcid) + { +- _lange *c = (_lange*) bsearch((const void*)lcid,s_lang_table, +- sizeof(s_lang_table)/sizeof(_lange), +- sizeof(_lange),_ltcomp); +- if (c) return c->name; ++ unsigned i = 0; ++ ++ for (i=0; i < sizeof(s_lang_table)/sizeof(s_lang_table[0]); i++) ++ { ++ if (s_lang_table[i].id == lcid) ++ return s_lang_table[i].name; ++ } + return "-none-"; + } + diff --git a/libwps/makefile.mk b/libwps/makefile.mk index 3f9667bf008f..edb36cd08f5b 100644 --- a/libwps/makefile.mk +++ b/libwps/makefile.mk @@ -49,12 +49,12 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream .ENDIF -TARFILE_NAME=libwps-0.2.0 -TARFILE_MD5=9e436bff44c60dc8b97cba0c7fc11a5c +TARFILE_NAME=libwps-0.2.1 +TARFILE_MD5=83d4029aebf290c0a9a8fee9c99638d3 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src/lib -PATCH_FILES=libwps-0.2.0.patch +PATCH_FILES=libwps-0.2.1.patch libwps-0.2.1-warnings.patch # --- Targets ------------------------------------------------------ |