? bug7389.diff ? warning.patch ? docs/build/.BUILD.TXT.swp Index: src/af/ev/unix/ev_UnixMenu.cpp =================================================================== RCS file: /cvsroot/abi/src/af/ev/unix/ev_UnixMenu.cpp,v retrieving revision 1.115 diff -u -p -u -r1.115 ev_UnixMenu.cpp --- src/af/ev/unix/ev_UnixMenu.cpp 22 Feb 2005 11:52:00 -0000 1.115 +++ src/af/ev/unix/ev_UnixMenu.cpp 23 Mar 2005 00:39:38 -0000 @@ -438,7 +438,7 @@ static guint _ev_get_underlined_char(con // return the keycode right after the underline const UT_UCS4String str(szString); - for (int i = 0; i < str.length() - 1; ) + for (guint i = 0; i + 1 < str.length(); ) { if (str[i++] == '_') return gdk_unicode_to_keyval(str[i]); Index: src/af/xap/unix/xap_UnixFrameImpl.cpp =================================================================== RCS file: /cvsroot/abi/src/af/xap/unix/xap_UnixFrameImpl.cpp,v retrieving revision 1.88 diff -u -p -u -r1.88 xap_UnixFrameImpl.cpp --- src/af/xap/unix/xap_UnixFrameImpl.cpp 20 Mar 2005 17:38:22 -0000 1.88 +++ src/af/xap/unix/xap_UnixFrameImpl.cpp 23 Mar 2005 00:39:38 -0000 @@ -639,7 +639,6 @@ gint XAP_UnixFrameImpl::_fe::configure_e XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(g_object_get_data(G_OBJECT(w), "user_data")); XAP_Frame* pFrame = pUnixFrameImpl->getFrame(); AV_View * pView = pFrame->getCurrentView(); - XAP_Frame::tZoomType zType = pFrame->getZoomType(); if (pView) { pUnixFrameImpl->m_iNewWidth = e->width; Index: src/af/xap/unix/xap_UnixPSGraphics.cpp =================================================================== RCS file: /cvsroot/abi/src/af/xap/unix/xap_UnixPSGraphics.cpp,v retrieving revision 1.145 diff -u -p -u -r1.145 xap_UnixPSGraphics.cpp --- src/af/xap/unix/xap_UnixPSGraphics.cpp 24 Feb 2005 23:43:59 -0000 1.145 +++ src/af/xap/unix/xap_UnixPSGraphics.cpp 23 Mar 2005 00:39:38 -0000 @@ -837,7 +837,7 @@ void PS_Graphics::_emit_DocumentNeededRe void PS_Graphics::_emit_IncludeResource(void) { UT_Vector vec; - UT_uint32 k,n; + UT_uint32 k; UT_uint32 kLimit = m_vecFontList.getItemCount(); // fonts are always embedded in the document now, as this was causing way Index: src/text/fmt/xp/fl_BlockLayout.cpp =================================================================== RCS file: /cvsroot/abi/src/text/fmt/xp/fl_BlockLayout.cpp,v retrieving revision 1.746 diff -u -p -u -r1.746 fl_BlockLayout.cpp --- src/text/fmt/xp/fl_BlockLayout.cpp 19 Mar 2005 12:02:35 -0000 1.746 +++ src/text/fmt/xp/fl_BlockLayout.cpp 23 Mar 2005 00:39:39 -0000 @@ -7558,12 +7558,12 @@ fl_BlockLayout::findGrammarSquigglesForR UT_ASSERT(pRun->getType() == FPRUN_TEXT); fp_TextRun* pTextRun = (static_cast(pRun)); - UT_sint32 runBlockOffset = pRun->getBlockOffset(); - UT_sint32 runBlockEnd = runBlockOffset + pRun->getLength(); + UT_uint32 runBlockOffset = pRun->getBlockOffset(); + UT_uint32 runBlockEnd = runBlockOffset + pRun->getLength(); UT_sint32 iFirst, iLast; if (m_pGrammarSquiggles->findRange(runBlockOffset, runBlockEnd, iFirst, iLast,true)) { - UT_sint32 iStart = 0, iEnd; + UT_uint32 iStart = 0, iEnd; fl_PartOfBlock* pPOB; UT_sint32 i = iFirst; Index: src/text/fmt/xp/fl_DocLayout.cpp =================================================================== RCS file: /cvsroot/abi/src/text/fmt/xp/fl_DocLayout.cpp,v retrieving revision 1.273 diff -u -p -u -r1.273 fl_DocLayout.cpp --- src/text/fmt/xp/fl_DocLayout.cpp 10 Feb 2005 06:37:44 -0000 1.273 +++ src/text/fmt/xp/fl_DocLayout.cpp 23 Mar 2005 00:39:39 -0000 @@ -865,7 +865,7 @@ void FL_DocLayout::removeEndnoteContaine { pECon->getNext()->setPrev(pECon->getPrev()); } - fl_EndnoteLayout * pEL = static_cast(pECon->getSectionLayout()); +// fl_EndnoteLayout * pEL = static_cast(pECon->getSectionLayout()); // pDSL = static_cast(pEL->myContainingLayout()); // if(!pDSL->isCollapsing()) { Index: src/text/fmt/xp/fp_FrameContainer.cpp =================================================================== RCS file: /cvsroot/abi/src/text/fmt/xp/fp_FrameContainer.cpp,v retrieving revision 1.30 diff -u -p -u -r1.30 fp_FrameContainer.cpp --- src/text/fmt/xp/fp_FrameContainer.cpp 14 Mar 2005 13:08:00 -0000 1.30 +++ src/text/fmt/xp/fp_FrameContainer.cpp 23 Mar 2005 00:39:39 -0000 @@ -464,7 +464,7 @@ void fp_FrameContainer::drawHandles(dg_ UT_sint32 iXlow = pDA->xoff - m_iXpad; UT_sint32 iYlow = pDA->yoff - m_iYpad; - UT_Rect box(iXlow + pDA->pG->tlu(2), iYlow + pDA->pG->tlu(2), getFullWidth() - pDA->pG->tlu(4), getFullHeight() - pDA->pG->tluD(4)); + UT_Rect box(iXlow + pDA->pG->tlu(2), iYlow + pDA->pG->tlu(2), getFullWidth() - pDA->pG->tlu(4), getFullHeight() - pDA->pG->tlu(4)); getView()->drawSelectionBox(box, true); } Index: src/text/fmt/xp/fp_Run.cpp =================================================================== RCS file: /cvsroot/abi/src/text/fmt/xp/fp_Run.cpp,v retrieving revision 1.434 diff -u -p -u -r1.434 fp_Run.cpp --- src/text/fmt/xp/fp_Run.cpp 15 Mar 2005 15:09:07 -0000 1.434 +++ src/text/fmt/xp/fp_Run.cpp 23 Mar 2005 00:39:40 -0000 @@ -1783,10 +1783,10 @@ void fp_Run::_drawTextLine(UT_sint32 xof fp_TabRun::fp_TabRun(fl_BlockLayout* pBL, UT_uint32 iOffsetFirst, UT_uint32 iLen) : fp_Run(pBL, iOffsetFirst, iLen, FPRUN_TAB), - m_bIsTOC(false), - m_bIsTOCListLabel(false), m_leader(FL_LEADER_NONE), - m_TabType(FL_TAB_NONE) + m_TabType(FL_TAB_NONE), + m_bIsTOC(false), + m_bIsTOCListLabel(false) { lookupProperties(); } Index: src/text/fmt/xp/fv_View.cpp =================================================================== RCS file: /cvsroot/abi/src/text/fmt/xp/fv_View.cpp,v retrieving revision 1.1069 diff -u -p -u -r1.1069 fv_View.cpp --- src/text/fmt/xp/fv_View.cpp 22 Mar 2005 02:17:56 -0000 1.1069 +++ src/text/fmt/xp/fv_View.cpp 23 Mar 2005 00:39:41 -0000 @@ -763,7 +763,7 @@ bool FV_View::convertPositionedToInLine( } vecBlocks.addItem(pB); } - UT_sint32 iBlk = 0; + UT_uint32 iBlk = 0; fl_BlockLayout * pBL = vecBlocks.getNthItem(iBlk); fp_Line * pLine = static_cast(pBL->getFirstContainer()); bool bLoop = true; Index: src/text/fmt/xp/fv_View_protected.cpp =================================================================== RCS file: /cvsroot/abi/src/text/fmt/xp/fv_View_protected.cpp,v retrieving revision 1.226 diff -u -p -u -r1.226 fv_View_protected.cpp --- src/text/fmt/xp/fv_View_protected.cpp 20 Mar 2005 17:37:52 -0000 1.226 +++ src/text/fmt/xp/fv_View_protected.cpp 23 Mar 2005 00:39:41 -0000 @@ -485,7 +485,6 @@ void FV_View::_deleteSelection(PP_AttrPr { setPoint(origPos); } - UT_sint32 iCount = 0; if(isTabListAheadPoint() == true) { UT_uint32 iRealDeleteCount2; @@ -2684,8 +2683,6 @@ FV_View::_findGetNextBlockBuffer(fl_Bloc if(sdhEnd) { PT_DocPosition posStart = getDocument()->getStruxPosition(sdhStart); - PT_DocPosition posEnd = getDocument()->getStruxPosition(sdhEnd); - UT_uint32 iSize = posEnd - posStart + 1; PL_StruxFmtHandle psfh = NULL; getDocument()->getStruxOfTypeFromPosition((*pBlock)->getDocLayout()->getLID(),posStart,PTX_Block, &psfh); newBlock = reinterpret_cast(const_cast(psfh)); @@ -5367,12 +5364,10 @@ void FV_View::_removeThisHdrFtr(fl_HdrFt // // Need this to remove the HdrFtr attributes in the section strux. // - fl_DocSectionLayout * pDSL = pHdrFtr->getDocSectionLayout(); const XML_Char * pszHdrFtrType = NULL; UT_ASSERT(pHdrFtr->getContainerType() == FL_CONTAINER_HDRFTR); PL_StruxDocHandle sdhHdrFtr = pHdrFtr->getStruxDocHandle(); m_pDoc->getAttributeFromSDH(sdhHdrFtr,isShowRevisions(),getRevisionLevel(),PT_TYPE_ATTRIBUTE_NAME, &pszHdrFtrType); - PT_DocPosition posDSL = m_pDoc->getStruxPosition(pDSL->getStruxDocHandle()); // // Remove the header/footer strux // Index: src/text/fmt/xp/fv_VisualDragText.cpp =================================================================== RCS file: /cvsroot/abi/src/text/fmt/xp/fv_VisualDragText.cpp,v retrieving revision 1.36 diff -u -p -u -r1.36 fv_VisualDragText.cpp --- src/text/fmt/xp/fv_VisualDragText.cpp 22 Mar 2005 15:08:59 -0000 1.36 +++ src/text/fmt/xp/fv_VisualDragText.cpp 23 Mar 2005 00:39:41 -0000 @@ -560,7 +560,6 @@ void FV_VisualDragText::getImageFromSele m_recCurFrame.top = yy; fp_Line * pNext = pLineLow; UT_sint32 width = 0; - UT_sint32 iRightpos = 0; while(pNext && (pNext != pLineHigh)) { pRun = pNext->getFirstRun(); Index: src/text/ptbl/xp/pf_Frag.cpp =================================================================== RCS file: /cvsroot/abi/src/text/ptbl/xp/pf_Frag.cpp,v retrieving revision 1.18 diff -u -p -u -r1.18 pf_Frag.cpp --- src/text/ptbl/xp/pf_Frag.cpp 3 Jan 2005 11:05:56 -0000 1.18 +++ src/text/ptbl/xp/pf_Frag.cpp 23 Mar 2005 00:39:41 -0000 @@ -28,8 +28,8 @@ pf_Frag::pf_Frag(pt_PieceTable * pPT, PF m_length(length), m_next(NULL), m_prev(NULL), - m_pPieceTable(pPT), m_pField(NULL), + m_pPieceTable(pPT), m_docPos(0), m_iXID(0) { Index: src/text/ptbl/xp/pt_PT_Styles.cpp =================================================================== RCS file: /cvsroot/abi/src/text/ptbl/xp/pt_PT_Styles.cpp,v retrieving revision 1.95 diff -u -p -u -r1.95 pt_PT_Styles.cpp --- src/text/ptbl/xp/pt_PT_Styles.cpp 20 Mar 2005 09:45:55 -0000 1.95 +++ src/text/ptbl/xp/pt_PT_Styles.cpp 23 Mar 2005 00:39:41 -0000 @@ -393,7 +393,7 @@ size_t pt_PieceTable::getStyleCount (voi return (size_t) m_hashStyles.size(); } - +#if 0 // currentl unused. suppress warning /////////////////////////////////////////////////////////////////////// /*! * compareStyleNames this function is used to compare the char * strings names @@ -410,6 +410,7 @@ static UT_sint32 compareStyleNames(const const char * sz2 = (*pS2)->getName(); return UT_stricmp(sz1, sz2); } +#endif bool pt_PieceTable::enumStyles(UT_uint32 k, const char ** pszName, Index: src/wp/ap/xp/ap_Dialog_FormatFrame.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Dialog_FormatFrame.cpp,v retrieving revision 1.15 diff -u -p -u -r1.15 ap_Dialog_FormatFrame.cpp --- src/wp/ap/xp/ap_Dialog_FormatFrame.cpp 9 Jan 2005 20:54:43 -0000 1.15 +++ src/wp/ap/xp/ap_Dialog_FormatFrame.cpp 23 Mar 2005 00:39:42 -0000 @@ -349,7 +349,8 @@ void AP_Dialog_FormatFrame::setAllSensit { XAP_Frame * frame = m_pApp->getLastFocussedFrame(); if (frame) { - if (FV_View * pView = static_cast(frame->getCurrentView())) { + FV_View * pView = static_cast(frame->getCurrentView()); + if (pView) { bool bInFrame = m_bSensitive; // pView->isInFrame(pView->getPoint()); setSensitivity(bInFrame); } Index: src/wp/ap/xp/ap_EditMethods.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_EditMethods.cpp,v retrieving revision 1.771 diff -u -p -u -r1.771 ap_EditMethods.cpp --- src/wp/ap/xp/ap_EditMethods.cpp 22 Mar 2005 02:17:58 -0000 1.771 +++ src/wp/ap/xp/ap_EditMethods.cpp 23 Mar 2005 00:39:43 -0000 @@ -5145,12 +5145,14 @@ static bool pView->cmdCharInsert(const U } #endif +#if 0 // disabled because of conditionnal below static void sActualInsertData(AV_View * pAV_View, EV_EditMethodCallData * pCallData) { ABIWORD_VIEW; pView->cmdCharInsert(pCallData->m_pData, pCallData->m_dataLength); return; } +#endif Defun(insertData) { CHECK_FRAME; Index: src/wp/ap/xp/ap_TopRuler.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_TopRuler.h,v retrieving revision 1.81 diff -u -p -u -r1.81 ap_TopRuler.h --- src/wp/ap/xp/ap_TopRuler.h 22 Dec 2004 13:40:08 -0000 1.81 +++ src/wp/ap/xp/ap_TopRuler.h 23 Mar 2005 00:39:43 -0000 @@ -155,7 +155,7 @@ public: UT_GenericVector * m_vecFullTable; UT_sint32 m_iTablePadding; UT_sint32 m_iCells; - UT_sint32 m_iCurCell; + UT_uint32 m_iCurCell; union _u { struct _c { Index: src/wp/impexp/xp/ie_exp_HTML.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_exp_HTML.cpp,v retrieving revision 1.275 diff -u -p -u -r1.275 ie_exp_HTML.cpp --- src/wp/impexp/xp/ie_exp_HTML.cpp 22 Mar 2005 14:37:13 -0000 1.275 +++ src/wp/impexp/xp/ie_exp_HTML.cpp 23 Mar 2005 00:39:43 -0000 @@ -4783,7 +4783,6 @@ void s_HTML_Listener::_doEndnotes () { // Some combined bug fixes make tagpops no longer necessary, afaict. } UT_VECTOR_PURGEALL(PD_DocumentRange *,m_vecEndnotes); - m_vecEndnotes = NULL; } void s_HTML_Listener::_doFootnotes () { @@ -5741,8 +5740,8 @@ void s_TemplateHandler::Default (const X IE_Exp_HTML::IE_Exp_HTML (PD_Document * pDocument) : IE_Exp(pDocument), m_style_tree(new s_StyleTree(pDocument)), - m_bSuppressDialog(false), - m_toc_helper(0) + m_toc_helper(0), + m_bSuppressDialog(false) { m_exp_opt.bIs4 = false; m_exp_opt.bIsAbiWebDoc = false; Index: src/wp/impexp/xp/ie_exp_RTF.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_exp_RTF.cpp,v retrieving revision 1.99 diff -u -p -u -r1.99 ie_exp_RTF.cpp --- src/wp/impexp/xp/ie_exp_RTF.cpp 12 Mar 2005 12:42:21 -0000 1.99 +++ src/wp/impexp/xp/ie_exp_RTF.cpp 23 Mar 2005 00:39:43 -0000 @@ -956,7 +956,7 @@ bool IE_Exp_RTF::_write_rtf_header(void) _rtf_semi(); _rtf_close_brace(); - for(UT_sint32 i = 0; i < Revs.getItemCount(); ++i) + for(UT_uint32 i = 0; i < Revs.getItemCount(); ++i) { AD_Revision* pRev = Revs.getNthItem(i); if(!pRev) 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.168 diff -u -p -u -r1.168 ie_exp_RTF_listenerWriteDoc.cpp --- src/wp/impexp/xp/ie_exp_RTF_listenerWriteDoc.cpp 22 Mar 2005 16:20:39 -0000 1.168 +++ src/wp/impexp/xp/ie_exp_RTF_listenerWriteDoc.cpp 23 Mar 2005 00:39:44 -0000 @@ -88,9 +88,6 @@ void s_RTF_ListenerWriteDoc::_closeBlock // // Force the output of char properties for blank lines or list items. // - bool bInList = false; - const XML_Char * szListid=NULL; - const PP_AttrProp * pBlockAP = NULL; xxx_UT_DEBUGMSG(("SEVIOR: Close Block \n")); if(m_bInSpan) @@ -3052,7 +3049,7 @@ void s_RTF_ListenerWriteDoc::_open_cell( _export_AbiWord_Cell_props(api,false); } - UT_sint32 iOldRow = m_iTop; + //UT_sint32 iOldRow = m_iTop; UT_sint32 i =0; UT_sint32 iOldRight = m_iRight; xxx_UT_DEBUGMSG(("Setting cell API 1 NOW!!!!!!!!!!!!!!!!! %d \n",api)); 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.360 diff -u -p -u -r1.360 ie_imp_RTF.cpp --- src/wp/impexp/xp/ie_imp_RTF.cpp 22 Mar 2005 17:01:38 -0000 1.360 +++ src/wp/impexp/xp/ie_imp_RTF.cpp 23 Mar 2005 00:39:45 -0000 @@ -10165,7 +10165,7 @@ bool IE_Imp_RTF::HandleStyleDefinition(v } // if the stylesheet is malformed there might be nothing in the table ... - if (nesting == 1 && m_styleTable.getItemCount() > styleNumber ) + if (nesting == 1 && m_styleTable.getItemCount() > (UT_uint32)styleNumber ) { // Reached the end of a single style definition. // Use it.