Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

this will fix a crahing bug and also fix an editor bug

Browse Source
This commit is contained in:
mjudge%netscape.com 1998-10-09 02:49:20 +00:00
parent 253de14d2e
commit 2d942bc1af
2 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/layout/edtele.cpp
View File

@ -7378,7 +7378,6 @@ void CEditContainerElement::FinishedLoad( CEditBuffer *pBuffer )
// text element with just a space in a table cell
// This is OK and is needed to show cell border in browser
XP_Bool bIsTableCellWithOneSpace = FALSE;
if( pParent && pParent->IsTableCell() && GetNextSibling() == NULL )
{
if( !pChild )
@ -7408,7 +7407,9 @@ void CEditContainerElement::FinishedLoad( CEditBuffer *pBuffer )
bIsTableCellWithOneSpace = TRUE;
}
}
if( ! bIsTableCellWithOneSpace )
CEditBuffer *t_buffer;
t_buffer = GetEditBuffer();
if( ! bIsTableCellWithOneSpace && (t_buffer && !t_buffer->m_bNoRelayout))
{
for ( CEditElement* pChild = GetChild();
pChild;

74
lib/layout/layobj.c
View File

@ -327,7 +327,7 @@ lo_FormatObject(MWContext* context, lo_DocState* state, PA_Tag* tag)
}
#ifdef ANTHRAX
else /* we didn't find a TYPE param, so check the filename to get the type - amusil */
{
{
buff = lo_FetchParamValue(context, tag, PARAM_SRC);
/* if no src, check if there's a DATA param */
if(buff == NULL)
@ -335,41 +335,43 @@ lo_FormatObject(MWContext* context, lo_DocState* state, PA_Tag* tag)
/* extract the mimetype info */
PA_LOCK(str, char *, buff);
fileInfo = NET_cinfo_find_type(str);
str = fileInfo->type;
if((appletName = NPL_FindAppletEnabledForMimetype(str)) != NULL)
{
/* Set the type */
type = LO_EMBED;
sub_type = LO_JAVA;
/* set the CLASSID to whatever was put into "appletName" */
/*lo_SetClassID(tag, appletName);*/
lo_SetArgs((char*)tag->data, top);
lo_RemoveParam(tag, "type");
lo_RemoveParam(tag, "src");
lo_RemoveParam(tag, "data");
lo_AddParam(tag, "TYPE", JAVA_PLUGIN_MIMETYPE);
lo_AddParam(tag, "CODE", appletName);
/* do the same for the clone_tag */
if(top->clone_tag)
{
lo_AddParam(top->clone_tag, "CODE", appletName);
lo_RemoveParam(top->clone_tag, "type");
lo_RemoveParam(top->clone_tag, "src");
lo_RemoveParam(top->clone_tag, "data");
lo_AddParam(top->clone_tag, "TYPE", JAVA_PLUGIN_MIMETYPE);
}
XP_FREE(appletName); /* do we need to free this regardless? */
}
if(buff)
XP_FREE(buff);
}
if (buff)
{
PA_LOCK(str, char *, buff);
fileInfo = NET_cinfo_find_type(str);
str = fileInfo->type;
if((appletName = NPL_FindAppletEnabledForMimetype(str)) != NULL)
{
/* Set the type */
type = LO_EMBED;
sub_type = LO_JAVA;
/* set the CLASSID to whatever was put into "appletName" */
/*lo_SetClassID(tag, appletName);*/
lo_SetArgs((char*)tag->data, top);
lo_RemoveParam(tag, "type");
lo_RemoveParam(tag, "src");
lo_RemoveParam(tag, "data");
lo_AddParam(tag, "TYPE", JAVA_PLUGIN_MIMETYPE);
lo_AddParam(tag, "CODE", appletName);
/* do the same for the clone_tag */
if(top->clone_tag)
{
lo_AddParam(top->clone_tag, "CODE", appletName);
lo_RemoveParam(top->clone_tag, "type");
lo_RemoveParam(top->clone_tag, "src");
lo_RemoveParam(top->clone_tag, "data");
lo_AddParam(top->clone_tag, "TYPE", JAVA_PLUGIN_MIMETYPE);
}
XP_FREE(appletName); /* do we need to free this regardless? */
}
if(buff)
XP_FREE(buff);
}
}
#endif /* ANTRHAX */