diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-07-30 05:10:36 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-07-30 05:10:36 +0000 |
commit | 30bf3b5af83a92aa35bcbf53e6f1ca6202de60ef (patch) | |
tree | 44ed7632e3dace187948e9338857b32ceaac0ed2 /editors/abiword | |
parent | A utility by NIST to process data and produce statistical plots. (diff) |
Update to 1.99.3.
Notes
Notes:
svn path=/head/; revision=85890
Diffstat (limited to 'editors/abiword')
-rw-r--r-- | editors/abiword/Makefile | 2 | ||||
-rw-r--r-- | editors/abiword/distinfo | 2 | ||||
-rw-r--r-- | editors/abiword/files/patch-src_af_xap_xp_xap_Draw_Symbol.cpp | 36 | ||||
-rw-r--r-- | editors/abiword/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp | 79 |
4 files changed, 38 insertions, 81 deletions
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 3e9a8d489d09..572076282b98 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -6,7 +6,7 @@ # PORTNAME= AbiWord2 -PORTVERSION= 1.99.2 +PORTVERSION= 1.99.3 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/ diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo index eabe0670e42f..c51bc0b2b6b4 100644 --- a/editors/abiword/distinfo +++ b/editors/abiword/distinfo @@ -1 +1 @@ -MD5 (AbiWord/abiword-1.99.2.tar.gz) = 6319519f6f8b3eb70b0370bf694350d4 +MD5 (AbiWord/abiword-1.99.3.tar.gz) = 60004be37795b7eae835c7e192868a87 diff --git a/editors/abiword/files/patch-src_af_xap_xp_xap_Draw_Symbol.cpp b/editors/abiword/files/patch-src_af_xap_xp_xap_Draw_Symbol.cpp new file mode 100644 index 000000000000..baf6ff9a7985 --- /dev/null +++ b/editors/abiword/files/patch-src_af_xap_xp_xap_Draw_Symbol.cpp @@ -0,0 +1,36 @@ +--- src/af/xap/xp/xap_Draw_Symbol.cpp.orig Wed Jul 30 01:04:34 2003 ++++ src/af/xap/xp/xap_Draw_Symbol.cpp Wed Jul 30 01:07:18 2003 +@@ -153,7 +153,7 @@ + + for (i = 0; i < m_vCharSet.size(); i += 2) + { +- UT_UCSChar base = static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(m_vCharSet[i])); ++ UT_UCSChar base = static_cast<UT_UCSChar>(reinterpret_cast<unsigned long>(m_vCharSet[i])); + size_t nb_chars = reinterpret_cast<size_t>(m_vCharSet[i + 1]); + + for (UT_UCSChar j = base; j < base + nb_chars; ++j) +@@ -194,11 +194,11 @@ + UT_DEBUGMSG(("calcSymbolFromCoords(x = [%u], y = [%u]) =", ix, iy)); + for (size_t i = 0; i < m_vCharSet.size(); i += 2) + { +- count += reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]); ++ count += static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i + 1])); + if (count > index) + { + UT_DEBUGMSG((" %u\n", static_cast<UT_uint32>(reinterpret_cast<UT_uint32>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1])))); +- return static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1])); ++ return static_cast<UT_UCSChar>(static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i])) + index - count + static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i + 1]))); + } + } + +@@ -227,8 +227,8 @@ + + for (size_t i = 0; i < m_vCharSet.size(); i += 2) + { +- UT_uint32 base = reinterpret_cast<UT_uint32>(m_vCharSet[i]); +- UT_uint32 size = reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]); ++ UT_uint32 base = static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i])); ++ UT_uint32 size = static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i + 1])); + + if (base + size > c) + { diff --git a/editors/abiword/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp b/editors/abiword/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp deleted file mode 100644 index 6da5af2f452b..000000000000 --- a/editors/abiword/files/patch-src_text_ptbl_xp_pp_AttrProp.cpp +++ /dev/null @@ -1,79 +0,0 @@ ---- src/text/ptbl/xp/pp_AttrProp.cpp.orig Sat Jul 12 02:57:05 2003 -+++ src/text/ptbl/xp/pp_AttrProp.cpp Sat Jul 12 03:04:49 2003 -@@ -82,7 +82,7 @@ - void* tmp = const_cast<void*> (entry->first()); - FREEP(tmp); - if (entry->second()) -- delete static_cast<const PP_PropertyType *>(entry->second()); -+ delete (const PP_PropertyType*)entry->second(); - delete entry; - } - } -@@ -336,7 +336,7 @@ - - FREEP(tmp); - if (p->second()) -- delete static_cast<const PP_PropertyType *>(p->second()); -+ delete (const PP_PropertyType *)p->second(); - delete p; - - if(bRemove) -@@ -406,7 +406,7 @@ - if ( (i == ndx) && c.is_valid()) - { - szName = static_cast<const XML_Char*>(c.key().c_str()); -- szValue = static_cast<const XML_Char*>(static_cast<const UT_Pair*>(val)->first()); -+ szValue = (const XML_Char*)(static_cast<const UT_Pair*>(val)->first()); - return true; - } - return false; -@@ -421,7 +421,7 @@ - if (!pEntry) - return false; - -- szValue = static_cast<const XML_Char *>(static_cast<const UT_Pair*>(pEntry)->first()); -+ szValue = (const XML_Char *)(static_cast<const UT_Pair*>(pEntry)->first()); - - return true; - } -@@ -440,12 +440,12 @@ - m_pProperties->set(szName, new UT_Pair - (pEntry->first(), - PP_PropertyType::createPropertyType(Type, -- static_cast<const XML_Char *>(pEntry->first())))); -+ (const XML_Char *)(pEntry->first())))); - delete pEntry; - pEntry = static_cast<const UT_Pair *>(m_pProperties->pick(szName)); - } - -- return static_cast<const PP_PropertyType *>(pEntry->second()); -+ return (const PP_PropertyType *)(pEntry->second()); - } - bool PP_AttrProp::getAttribute(const XML_Char * szName, const XML_Char *& szValue) const - { -@@ -750,14 +750,14 @@ - { - const UT_Pair* p = static_cast<const UT_Pair*>(pEntry); - -- if(*(static_cast<const XML_Char *>(p->first())) == 0) -+ if(*((const XML_Char *)(p->first())) == 0) - { - - void* tmp = const_cast<void*> (p->first()); - UT_ASSERT(!m_bIsReadOnly); - FREEP(tmp); - if (p->second()) -- delete static_cast<const PP_PropertyType *>(p->second()); -+ delete (const PP_PropertyType *)(p->second()); - delete p; - - m_pProperties->remove(_hc1.key(),pEntry); -@@ -985,7 +985,7 @@ - while (val != NULL) - { - s1 = static_cast<const XML_Char *>(c2.key().c_str()); -- s2 = static_cast<const XML_Char *>(static_cast<const UT_Pair*>(val)->first()); -+ s2 = (const XML_Char *)(static_cast<const UT_Pair*>(val)->first()); - - m_checkSum += UT_XML_strlen(s1); - m_checkSum += UT_XML_strlen(s2); |