Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 22:32:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backing out the patch for bug 287707, since it is causing smoketest blocker bug 351057

Browse Source
This commit is contained in:
martijn.martijn%gmail.com 2006-09-01 19:51:05 +00:00
parent 321d6733ed
commit 72138f14ca
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docshell/base/nsDocShellEditorData.cpp
View File

@ -192,10 +192,7 @@ nsDocShellEditorData::SetEditor(nsIEditor *inEditor)
mEditor = inEditor; // owning addref
}
if (!inEditor)
mMakeEditable = PR_FALSE;
return NS_OK;
}

10
editor/libeditor/html/nsHTMLEditor.cpp
View File

@ -183,18 +183,10 @@ nsHTMLEditor::~nsHTMLEditor()
if (mResizedObject)
HideResizers();
nsCOMPtr<nsISelectionController> selCon;
nsresult result = GetSelectionController(getter_AddRefs(selCon));
if (NS_SUCCEEDED(result) && selCon)
{
selCon->SetSelectionFlags(
nsISelectionDisplay::DISPLAY_TEXT | nsISelectionDisplay::DISPLAY_IMAGES);
}
//the autopointers will clear themselves up.
//but we need to also remove the listeners or we have a leak
nsCOMPtr<nsISelection>selection;
result = GetSelection(getter_AddRefs(selection));
nsresult result = GetSelection(getter_AddRefs(selection));
// if we don't get the selection, just skip this
if (NS_SUCCEEDED(result) && selection)
{