Hi folks,
the mess with expat's XML_Char (which is defined as (char *)) and
libxml2's XML_Char (which is defined as (unsigned char *)) is awful.
Included is a patch that should at least make it compile (add it
to my previous patch on this subject!). But you don't want to know
about the amount of warnings that compiling with ABI_OPT_LIBXML2
generates.
Why do we try to support both expat and libxml2? I choose libxml2
myself because I have it in shared form, on the theory that this
will cut down on the size of the AbiWord image. But, unless there
is a good reason why we support both (do they not run on all
platforms?) I think we should resolve which one we want to use.
Comments?
Frodo
--
Frodo Looijaard <[EMAIL PROTECTED]> PGP key and more: http://huizen.dds.nl/~frodol
Defenestration n. (formal or joc.):
The act of removing Windows from your computer in disgust, usually followed
by the installation of Linux or some other Unix-like operating system.
Index: src/wp/impexp/xp/ie_exp_RTF_listenerWriteDoc.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_exp_RTF_listenerWriteDoc.cpp,v
retrieving revision 1.28
diff -r1.28 ie_exp_RTF_listenerWriteDoc.cpp
634c634
< if (!pBlockAP || !pBlockAP->getAttribute("listid", szListid))
---
> if (!pBlockAP || !pBlockAP->getAttribute((const XML_Char*)"listid", szListid))
636c636
< if (!pBlockAP || !pBlockAP->getAttribute("parentid", szParentid))
---
> if (!pBlockAP || !pBlockAP->getAttribute((const XML_Char*)"parentid",
>szParentid))
638c638
< if (!pBlockAP || !pBlockAP->getAttribute("level", szLevel))
---
> if (!pBlockAP || !pBlockAP->getAttribute((const XML_Char*)"level", szLevel))
640c640
< if (!pBlockAP || !pBlockAP->getAttribute("style", szListStyle))
---
> if (!pBlockAP || !pBlockAP->getAttribute((const XML_Char*)"style",
>szListStyle))
666,669c666,669
< m_pie->_rtf_keyword_ifnotdefault("abilistid",szListid,-1);
< m_pie->_rtf_keyword_ifnotdefault("abilistparentid",szParentid,-1);
< m_pie->_rtf_keyword_ifnotdefault("abilistlevel",szLevel,-1);
< m_pie->_rtf_keyword_ifnotdefault("abistartat",szAbiStartValue,-1);
---
> m_pie->_rtf_keyword_ifnotdefault("abilistid",(char *) szListid,-1);
> m_pie->_rtf_keyword_ifnotdefault("abilistparentid",(char *)
>szParentid,-1);
> m_pie->_rtf_keyword_ifnotdefault("abilistlevel",(char *) szLevel,-1);
> m_pie->_rtf_keyword_ifnotdefault("abistartat",(char *)
>szAbiStartValue,-1);
674c674
< m_pie->_rtf_chardata( szAbiFieldFont ,strlen(szAbiFieldFont));
---
> m_pie->_rtf_chardata( (const char *) szAbiFieldFont
>,strlen(szAbiFieldFont));
681c681
< m_pie->_rtf_chardata( szAbiListDecimal ,strlen(szAbiListDecimal));
---
> m_pie->_rtf_chardata((const char *) szAbiListDecimal
>,strlen(szAbiListDecimal));
688c688
< m_pie->_rtf_chardata( szAbiListDelim ,strlen( szAbiListDelim));
---
> m_pie->_rtf_chardata((const char *) szAbiListDelim ,strlen(
>szAbiListDelim));
695c695
< m_pie->_rtf_chardata( szListStyle ,strlen( szListStyle));
---
> m_pie->_rtf_chardata((const char *) szListStyle ,strlen(
>szListStyle));
Index: src/wp/impexp/xp/ie_imp_RTF.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_imp_RTF.cpp,v
retrieving revision 1.34
diff -r1.34 ie_imp_RTF.cpp
1534c1534
< pAuto = new fl_AutoNum(id, pid, lType,
startValue, m_currentRTFState.m_paraProps.m_pszListDelim,
m_currentRTFState.m_paraProps.m_pszListDecimal, m_pDocument);
---
> pAuto = new fl_AutoNum(id, pid, lType,
>startValue,(XML_Char *) m_currentRTFState.m_paraProps.m_pszListDelim,(XML_Char *)
>m_currentRTFState.m_paraProps.m_pszListDecimal, m_pDocument);
