Subject: Patch: Warnings
From: Andrew Dunbar (hippietrail@yahoo.com)
Date: Mon Jun 25 2001 - 00:13:09 CDT
This patch fixes a the obvious and minor warnings during Windows
builds. There remain quite a few less superficial ones.
Feel free to disagree with my fixes (:
Fixes these:
pf_Fragments.cpp(215) : warning C4390: ';' : empty controlled statement
found; is this the intent?
pp_Property.cpp(480) : warning C4800: 'int' : forcing value to bool
'true' or 'false' (performance warning)
ie_exp_LaTeX.cpp(578) : warning C4390: ';' : empty controlled statement
found; is this the intent?
ie_exp_LaTeX.cpp(593) : warning C4390: ';' : empty controlled statement
found; is this the intent?
ie_imp_MsWord_97.cpp(572) : warning C4101: 'picf' : unreferenced local
variable
ie_imp_MsWord_97.cpp(569) : warning C4101: 'fil' : unreferenced local
variable
Andrew Dunbar.
-- http://linguaphile.sourceforge.net
Index: src/text/ptbl/xp/pf_Fragments.cpp =================================================================== RCS file: /cvsroot/abi/src/text/ptbl/xp/pf_Fragments.cpp,v retrieving revision 1.14 diff -u -r1.14 pf_Fragments.cpp --- src/text/ptbl/xp/pf_Fragments.cpp 2001/06/07 06:30:15 1.14 +++ src/text/ptbl/xp/pf_Fragments.cpp 2001/06/25 05:03:06 @@ -211,7 +211,9 @@ } xxx_UT_DEBUGMSG(("SEVIOR: Found at pos %d Looking for pos %d \n",curFrag->getPos(),pos)); if(curFrag && curFrag->getPrev() && curFrag->getNext()) + { xxx_UT_DEBUGMSG(("SEVIOR Frag pos before = %d Frag Pos After %d Looking for pos %d \n",curFrag->getPrev()->getPos(),curFrag->getPos(),curFrag->getNext()->getPos(),pos)); + } return curFrag; } Index: src/text/ptbl/xp/pp_Property.cpp =================================================================== RCS file: /cvsroot/abi/src/text/ptbl/xp/pp_Property.cpp,v retrieving revision 1.67 diff -u -r1.67 pp_Property.cpp --- src/text/ptbl/xp/pp_Property.cpp 2001/06/19 02:57:23 1.67 +++ src/text/ptbl/xp/pp_Property.cpp 2001/06/25 05:03:09 @@ -477,7 +477,7 @@ PP_PropertyTypeBool::PP_PropertyTypeBool(const XML_Char *p_init) { - State = UT_strcmp("yes", p_init); + State = (UT_strcmp("yes", p_init) != 0); } PP_PropertyTypeInt::PP_PropertyTypeInt(const XML_Char *p_init) Index: src/wp/impexp/xp/ie_exp_LaTeX.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_exp_LaTeX.cpp,v retrieving revision 1.27 diff -u -r1.27 ie_exp_LaTeX.cpp --- src/wp/impexp/xp/ie_exp_LaTeX.cpp 2001/05/25 05:52:20 1.27 +++ src/wp/impexp/xp/ie_exp_LaTeX.cpp 2001/06/25 05:03:28 @@ -21,6 +21,7 @@ #include <stdlib.h> #include <string.h> +#include "ut_debugmsg.h" #include "ut_string.h" #include "ut_bytebuf.h" #include "ut_base64.h" @@ -573,7 +574,9 @@ } if (pAP->getProperty("color", szValue)) - ; // TODO + { + UT_DEBUGMSG (("Latex export: TODO: 'color' property\n")); + } if (pAP->getProperty("font-size", szValue)) { @@ -588,7 +591,9 @@ } if (pAP->getProperty("font-family", szValue)) - ; // TODO + { + UT_DEBUGMSG (("Latex export: TODO: 'font-family' property\n")); + } m_bInSpan = true; m_pAP_Span = pAP; Index: src/wp/impexp/xp/ie_imp_MsWord_97.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_imp_MsWord_97.cpp,v retrieving revision 1.96 diff -u -r1.96 ie_imp_MsWord_97.cpp --- src/wp/impexp/xp/ie_imp_MsWord_97.cpp 2001/06/22 18:20:01 1.96 +++ src/wp/impexp/xp/ie_imp_MsWord_97.cpp 2001/06/25 05:03:36 @@ -566,11 +566,13 @@ int IE_Imp_MsWord_97::_specCharProc (wvParseStruct *ps, U16 eachchar, CHP *achp) { Blip blip; - wvStream *fil; long pos; FSPA * fspa; - PICF picf; FDOA * fdoa; +#ifdef SUPPORTS_OLD_IMAGES + wvStream *fil; + PICF picf; +#endif // // This next bit of code is to handle fields
_________________________________________________________ Do You Yahoo!? Get your free @yahoo.com address at http://mail.yahoo.com
This archive was generated by hypermail 2b25 : Mon Jun 25 2001 - 00:18:05 CDT