Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small but pervasive change to make nsIDOMSelection an xpidl interface. also broke it into 2 interfaces, nsISelection and nsISelectionPrivate. moved nsIDOMSelectionListener also to xpidl. these new idl files live in layout/base/public. r=sfraser, r=anthonyd bug 48575

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@79118 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mjudge%netscape.com
2000-09-14 11:45:01 +00:00
parent a3f38f63e7
commit 2fc6190bef
168 changed files with 1687 additions and 3324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/content/html/document/src/nsHTMLDocument.cpp
View File

@@ -93,6 +93,7 @@
#include "nsIEventListenerManager.h"
#include "nsISelectElement.h"
#include "nsIFrameSelection.h"
#include "nsISelectionPrivate.h"//for toStringwithformat code
#include "nsICharsetDetector.h"
#include "nsICharsetDetectionAdaptor.h"
@@ -2842,13 +2843,14 @@ nsHTMLDocument::GetSelection(nsAWritableString& aReturn)
if (!selection)
return NS_OK;
nsCOMPtr<nsIDOMSelection> domSelection;
nsCOMPtr<nsISelection> domSelection;
selection->GetSelection(nsISelectionController::SELECTION_NORMAL,
getter_AddRefs(domSelection));
if (!domSelection)
return NS_OK;
nsCOMPtr<nsISelectionPrivate> privSel(do_QueryInterface(domSelection));
nsCOMPtr<nsIConsoleService> consoleService
(do_GetService("mozilla.consoleservice.1"));
@@ -2856,8 +2858,14 @@ nsHTMLDocument::GetSelection(nsAWritableString& aReturn)
if (consoleService) {
consoleService->LogStringMessage(NS_LITERAL_STRING("Deprecated method document.getSelection() called. Please use window.getSelection() instead.").get());
}
return domSelection->ToString(NS_ConvertASCIItoUCS2("text/plain"), nsIDocumentEncoder::OutputFormatted |nsIDocumentEncoder::OutputSelectionOnly, 0, aReturn);
PRUnichar *tmp;
nsresult rv = privSel->ToStringWithFormat("text/plain", nsIDocumentEncoder::OutputFormatted |nsIDocumentEncoder::OutputSelectionOnly, 0, &tmp);
if (tmp)
{
aReturn.Assign(tmp);
nsMemory::Free(tmp);
}
return rv;
}
NS_IMETHODIMP
@@ -4138,7 +4146,7 @@ nsHTMLDocument::GetForms(nsIDOMHTMLCollection** aForms)
}
PRBool
nsHTMLDocument::IsInSelection(nsIDOMSelection* aSelection,
nsHTMLDocument::IsInSelection(nsISelection* aSelection,
const nsIContent* aContent) const
{
nsIAtom* tag;