Needed to build Win32 from latest CVS.
In "ie_imp_DocBook.cpp", the problem was spaces after the backslashes,
which is why the diffs don't look very different.
Index: src/wp/impexp/xp/ie_exp_KWord_1.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_exp_KWord_1.cpp,v
retrieving revision 1.2
diff -u -r1.2 ie_exp_KWord_1.cpp
--- src/wp/impexp/xp/ie_exp_KWord_1.cpp 2001/08/20 15:01:04 1.2
+++ src/wp/impexp/xp/ie_exp_KWord_1.cpp 2001/08/20 20:38:46
@@ -906,10 +906,10 @@
// e.g., <PAGEBREAKING linesTogether="true" keepWithNext="true"/>
bool bLinesTogether=false;
if (pAP->getProperty("keep-together", szValue))
- bLinesTogether = (strcasecmp(szValue,"true") == 0);
+ bLinesTogether = (UT_stricmp(szValue,"true") == 0);
bool bKeepWithNext=false;
if (pAP->getProperty("keep-with-next", szValue))
- bKeepWithNext = (strcasecmp(szValue,"true") == 0);
+ bKeepWithNext = (UT_stricmp(szValue,"true") == 0);
// FIXME: I should probably run this if and only if the above properties
// exist (dealing with styles)
if (bLinesTogether || bKeepWithNext)
@@ -1089,7 +1089,7 @@
if (pAP->getProperty("font-weight", szValue))
{
m_sFormats += "<WEIGHT value=\"";
- if (!strcasecmp((char *) szValue, "bold"))
+ if (!UT_stricmp((char *) szValue, "bold"))
m_sFormats += "75";
else
m_sFormats += "50";
@@ -1100,7 +1100,7 @@
if (pAP->getProperty("font-style", szValue))
{
m_sFormats += "<ITALIC value=\"";
- if (!strcasecmp((char *) szValue, "italic"))
+ if (!UT_stricmp((char *) szValue, "italic"))
m_sFormats += "1";
else
m_sFormats += "0";
@@ -1124,9 +1124,9 @@
// <VERTALIGN value="0"/> 0=normal, 1=subscript, 2=superscript
if (pAP->getProperty("text-position", szValue))
{
- if (!strcasecmp (szValue, "subscript"))
+ if (!UT_stricmp (szValue, "subscript"))
m_sFormats += "<VERTALIGN value=\"1\"/>\n";
- else if (!strcasecmp (szValue, "superscript"))
+ else if (!UT_stricmp (szValue, "superscript"))
m_sFormats += "<VERTALIGN value=\"2\"/>\n";
else
m_sFormats += "<VERTALIGN value=\"0\"/>\n";
Index: src/wp/impexp/xp/ie_imp_DocBook.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_imp_DocBook.cpp,v
retrieving revision 1.17
diff -u -r1.17 ie_imp_DocBook.cpp
--- src/wp/impexp/xp/ie_imp_DocBook.cpp 2001/08/20 15:01:04 1.17
+++ src/wp/impexp/xp/ie_imp_DocBook.cpp 2001/08/20 20:38:46
@@ -197,17 +197,17 @@
#define X_TestParseState(ps) ((m_parseState==(ps)))
#define X_VerifyParseState(ps) do { if (!(X_TestParseState(ps)))
\
- {
UT_DEBUGMSG(("DOM: X_VerifyParseState failed: %s\n", #ps)); \
+ {
+UT_DEBUGMSG(("DOM: X_VerifyParseState failed: %s\n", #ps)); \
m_error =
UT_IE_BOGUSDOCUMENT; \
return; } } while (0)
#define X_CheckDocument(b) do { if (!(b))
\
- {
UT_DEBUGMSG(("DOM: X_CheckDocument failed: %s\n", #b)); \
+ {
+UT_DEBUGMSG(("DOM: X_CheckDocument failed: %s\n", #b)); \
m_error =
UT_IE_BOGUSDOCUMENT; \
return; } } while (0)
#define X_CheckError(v) do { if (!(v))
\
- {
UT_DEBUGMSG(("DOM: X_CheckError failed: %s\n", #v)); \
+ {
+UT_DEBUGMSG(("DOM: X_CheckError failed: %s\n", #v)); \
m_error =
UT_ERROR; \
return; } } while (0)
