From b9778d743ebb1267f9ca1e3c906c0ee47bf2eb1b Mon Sep 17 00:00:00 2001 From: "cmanske%netscape.com" Date: Tue, 29 Sep 1998 04:12:14 +0000 Subject: [PATCH] Trying to fix Linux build problems --- lib/layout/editor.cpp | 4 ++-- lib/layout/editor.h | 6 +++--- lib/layout/edtbuf.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/layout/editor.cpp b/lib/layout/editor.cpp index 8fa1ca6030a..395550863b4 100644 --- a/lib/layout/editor.cpp +++ b/lib/layout/editor.cpp @@ -1948,12 +1948,12 @@ void EDT_SetDirtyFlag( MWContext *pContext, XP_Bool bValue ){ EDT_ClipboardResult EDT_CanCut(MWContext *pContext, XP_Bool bStrictChecking){ GET_EDIT_BUF_OR_RETURN(pContext, pEditBuffer) EDT_COP_DOCUMENT_BUSY; - return pEditBuffer->CanCut( bStrictChecking ); + return pEditBuffer->CanCut( bStrictChecking, (XP_Bool)FALSE ); } EDT_ClipboardResult EDT_CanCopy(MWContext *pContext, XP_Bool bStrictChecking){ GET_EDIT_BUF_OR_RETURN(pContext, pEditBuffer) EDT_COP_DOCUMENT_BUSY; - return pEditBuffer->CanCopy( bStrictChecking ); + return pEditBuffer->CanCopy( bStrictChecking, (XP_Bool)FALSE ); } EDT_ClipboardResult EDT_CanPaste(MWContext *pContext, XP_Bool bStrictChecking){ diff --git a/lib/layout/editor.h b/lib/layout/editor.h index 6c4ba2a8f2c..b17ee39aceb 100644 --- a/lib/layout/editor.h +++ b/lib/layout/editor.h @@ -3646,10 +3646,10 @@ public: // When bCheckForCellBoundary is TRUE, then we return EDT_COP_SELECTION_CROSSES_TABLE_DATA_CELL // when selection crosses a cell boundary. This is used internally to know when to handle this case. // Calls from UI should use FALSE, which will return EDT_OK if we cross cell boundary - EDT_ClipboardResult CanCut(XP_Bool bStrictChecking, XP_Bool bCheckForCellBoundary = FALSE); - EDT_ClipboardResult CanCut(CEditSelection& selection, XP_Bool bStrictChecking, XP_Bool bCheckForCellBoundary = FALSE); + EDT_ClipboardResult CanCut(XP_Bool bStrictChecking, XP_Bool bCheckForCellBoundary); + EDT_ClipboardResult CanCut(CEditSelection& selection, XP_Bool bStrictChecking, XP_Bool bCheckForCellBoundary); EDT_ClipboardResult CanCopy(XP_Bool bStrictChecking, XP_Bool bCheckForCellBoundary = FALSE); - EDT_ClipboardResult CanCopy(CEditSelection& selection, XP_Bool bStrictChecking, XP_Bool bCheckForCellBoundary = FALSE); + EDT_ClipboardResult CanCopy(CEditSelection& selection, XP_Bool bStrictChecking, XP_Bool bCheckForCellBoundary); EDT_ClipboardResult CanPaste(XP_Bool bStrictChecking); EDT_ClipboardResult CanPaste(CEditSelection& selection, XP_Bool bStrictChecking); diff --git a/lib/layout/edtbuf.cpp b/lib/layout/edtbuf.cpp index 66eabd7143e..56b5ff08847 100644 --- a/lib/layout/edtbuf.cpp +++ b/lib/layout/edtbuf.cpp @@ -2975,7 +2975,7 @@ EDT_ClipboardResult CEditBuffer::DeleteChar(XP_Bool bForward, XP_Bool bTyping) // outside a table into a table from cell to cell, // but delete key (bForward = TRUE) has lots of strange side-effects // so lets not allow that (TRUE means check for cell boundaries) - result = CanCut(selection, TRUE, bForward); + result = CanCut(selection, (XP_Bool)TRUE, bForward); if ( result == EDT_COP_OK ) { DeleteSelection(selection, FALSE); } @@ -14569,7 +14569,7 @@ EDT_ClipboardResult CEditBuffer::CopySelection( char **ppText, int32* pTextLen, char **ppHtml, int32* pHtmlLen ) { // Do "strict" testing and tell is if we crossed a cell boundary - EDT_ClipboardResult result = CanCopy(TRUE, TRUE); + EDT_ClipboardResult result = CanCopy((XP_Bool)TRUE, (XP_Bool)TRUE); if ( !(result == EDT_COP_OK || result == EDT_COP_SELECTION_CROSSES_TABLE_DATA_CELL) ) return result;