diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h index ceeac10c636..6b2a9c04c62 100644 --- a/layout/base/nsIPresShell.h +++ b/layout/base/nsIPresShell.h @@ -38,9 +38,6 @@ class nsString; class nsStringArray; class nsICaret; class nsIStyleContext; -#ifndef NEW_CLIPBOARD_SUPPORT -class nsISelectionMgr; -#endif #define NS_IPRESSHELL_IID \ { 0x76e79c60, 0x944e, 0x11d1, \ @@ -261,13 +258,9 @@ public: PRUint32 aHFlags) const = 0; /** - * Notify the SelectionMgr that we have something to copy. + * Notify the Clipboard that we have something to copy. */ -#ifndef NEW_CLIPBOARD_SUPPORT - NS_IMETHOD DoCopy(nsISelectionMgr* aSelectionMgr) = 0; -#else NS_IMETHOD DoCopy() = 0; -#endif /** * Get the caret, if it exists. AddRefs it. diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index 77d3cbfecf5..2b01c16aad6 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -68,7 +68,6 @@ #include "nsIDataFlavor.h" -#ifdef NEW_CLIPBOARD_SUPPORT // Drag & Drop, Clipboard #include "nsWidgetsCID.h" #include "nsIClipboard.h" @@ -87,7 +86,6 @@ static NS_DEFINE_IID(kIDataFlavorIID, NS_IDATAFLAVOR_IID); static NS_DEFINE_IID(kCDataFlavorCID, NS_DATAFLAVOR_CID); static NS_DEFINE_IID(kCXIFConverterCID, NS_XIFFORMATCONVERTER_CID); static NS_DEFINE_IID(kIFormatConverterIID, NS_IFORMATCONVERTER_IID); -#endif static PRBool gsNoisyRefs = PR_FALSE; #undef NOISY @@ -325,11 +323,7 @@ public: PRInt32 aHOffsetPercent, PRUint32 aHFlags) const; -#ifdef NEW_CLIPBOARD_SUPPORT NS_IMETHOD DoCopy(); -#else - NS_IMETHOD DoCopy(nsISelectionMgr* aSelectionMgr); -#endif //nsIViewObserver interface @@ -1542,10 +1536,6 @@ PresShell::ScrollFrameIntoView(nsIFrame *aFrame, } - - -#ifdef NEW_CLIPBOARD_SUPPORT -// New way NS_IMETHODIMP PresShell::DoCopy() { @@ -1617,75 +1607,6 @@ PresShell::DoCopy() } return NS_OK; } -#else - -// Old SelectionMgr implementation. -NS_IMETHODIMP -PresShell::DoCopy(nsISelectionMgr* aSelectionMgr) -{ - nsCOMPtr doc; - GetDocument(getter_AddRefs(doc)); - if (doc) { - nsString buffer; - - nsIDOMSelection* sel = nsnull; - GetSelection(&sel); - - if (sel != nsnull) - doc->CreateXIF(buffer,sel); - NS_IF_RELEASE(sel); - - nsIParser* parser; - - static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID); - static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); - - nsresult rv = nsComponentManager::CreateInstance(kCParserCID, - nsnull, - kCParserIID, - (void **)&parser); - if (NS_OK != rv) - return rv; - - nsIHTMLContentSink* sink = nsnull; - -// rv = NS_New_HTML_ContentSinkStream(&sink,PR_FALSE,PR_FALSE); -// Changed to do plain text only for Dogfood -- gpk 3/14/99 - rv = NS_New_HTMLToTXT_SinkStream(&sink); - - ostream* copyStream; - rv = aSelectionMgr->GetCopyOStream(©Stream); - if (!NS_SUCCEEDED(rv)) - { - NS_IF_RELEASE(sink); - return rv; - } - -// Changed to do plain text only for Dogfood -- gpk 3/14/99 -// ((nsHTMLContentSinkStream*)sink)->SetOutputStream(*copyStream); - ((nsHTMLToTXTSinkStream*)sink)->SetOutputStream(*copyStream); - - if (NS_OK == rv) { - parser->SetContentSink(sink); - - nsIDTD* dtd = nsnull; - rv = NS_NewXIFDTD(&dtd); - if (NS_OK == rv) - { - parser->RegisterDTD(dtd); - parser->Parse(buffer, 0, "text/xif",PR_FALSE,PR_TRUE); - } - NS_IF_RELEASE(dtd); - aSelectionMgr->CopyToClipboard(); - } - NS_IF_RELEASE(sink); - NS_RELEASE(parser); - - } - return NS_OK; -} - -#endif // NEW_CLIPBOARD_SUPPORT NS_IMETHODIMP diff --git a/layout/base/public/nsIPresShell.h b/layout/base/public/nsIPresShell.h index ceeac10c636..6b2a9c04c62 100644 --- a/layout/base/public/nsIPresShell.h +++ b/layout/base/public/nsIPresShell.h @@ -38,9 +38,6 @@ class nsString; class nsStringArray; class nsICaret; class nsIStyleContext; -#ifndef NEW_CLIPBOARD_SUPPORT -class nsISelectionMgr; -#endif #define NS_IPRESSHELL_IID \ { 0x76e79c60, 0x944e, 0x11d1, \ @@ -261,13 +258,9 @@ public: PRUint32 aHFlags) const = 0; /** - * Notify the SelectionMgr that we have something to copy. + * Notify the Clipboard that we have something to copy. */ -#ifndef NEW_CLIPBOARD_SUPPORT - NS_IMETHOD DoCopy(nsISelectionMgr* aSelectionMgr) = 0; -#else NS_IMETHOD DoCopy() = 0; -#endif /** * Get the caret, if it exists. AddRefs it. diff --git a/layout/html/base/src/nsPresShell.cpp b/layout/html/base/src/nsPresShell.cpp index 77d3cbfecf5..2b01c16aad6 100644 --- a/layout/html/base/src/nsPresShell.cpp +++ b/layout/html/base/src/nsPresShell.cpp @@ -68,7 +68,6 @@ #include "nsIDataFlavor.h" -#ifdef NEW_CLIPBOARD_SUPPORT // Drag & Drop, Clipboard #include "nsWidgetsCID.h" #include "nsIClipboard.h" @@ -87,7 +86,6 @@ static NS_DEFINE_IID(kIDataFlavorIID, NS_IDATAFLAVOR_IID); static NS_DEFINE_IID(kCDataFlavorCID, NS_DATAFLAVOR_CID); static NS_DEFINE_IID(kCXIFConverterCID, NS_XIFFORMATCONVERTER_CID); static NS_DEFINE_IID(kIFormatConverterIID, NS_IFORMATCONVERTER_IID); -#endif static PRBool gsNoisyRefs = PR_FALSE; #undef NOISY @@ -325,11 +323,7 @@ public: PRInt32 aHOffsetPercent, PRUint32 aHFlags) const; -#ifdef NEW_CLIPBOARD_SUPPORT NS_IMETHOD DoCopy(); -#else - NS_IMETHOD DoCopy(nsISelectionMgr* aSelectionMgr); -#endif //nsIViewObserver interface @@ -1542,10 +1536,6 @@ PresShell::ScrollFrameIntoView(nsIFrame *aFrame, } - - -#ifdef NEW_CLIPBOARD_SUPPORT -// New way NS_IMETHODIMP PresShell::DoCopy() { @@ -1617,75 +1607,6 @@ PresShell::DoCopy() } return NS_OK; } -#else - -// Old SelectionMgr implementation. -NS_IMETHODIMP -PresShell::DoCopy(nsISelectionMgr* aSelectionMgr) -{ - nsCOMPtr doc; - GetDocument(getter_AddRefs(doc)); - if (doc) { - nsString buffer; - - nsIDOMSelection* sel = nsnull; - GetSelection(&sel); - - if (sel != nsnull) - doc->CreateXIF(buffer,sel); - NS_IF_RELEASE(sel); - - nsIParser* parser; - - static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID); - static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); - - nsresult rv = nsComponentManager::CreateInstance(kCParserCID, - nsnull, - kCParserIID, - (void **)&parser); - if (NS_OK != rv) - return rv; - - nsIHTMLContentSink* sink = nsnull; - -// rv = NS_New_HTML_ContentSinkStream(&sink,PR_FALSE,PR_FALSE); -// Changed to do plain text only for Dogfood -- gpk 3/14/99 - rv = NS_New_HTMLToTXT_SinkStream(&sink); - - ostream* copyStream; - rv = aSelectionMgr->GetCopyOStream(©Stream); - if (!NS_SUCCEEDED(rv)) - { - NS_IF_RELEASE(sink); - return rv; - } - -// Changed to do plain text only for Dogfood -- gpk 3/14/99 -// ((nsHTMLContentSinkStream*)sink)->SetOutputStream(*copyStream); - ((nsHTMLToTXTSinkStream*)sink)->SetOutputStream(*copyStream); - - if (NS_OK == rv) { - parser->SetContentSink(sink); - - nsIDTD* dtd = nsnull; - rv = NS_NewXIFDTD(&dtd); - if (NS_OK == rv) - { - parser->RegisterDTD(dtd); - parser->Parse(buffer, 0, "text/xif",PR_FALSE,PR_TRUE); - } - NS_IF_RELEASE(dtd); - aSelectionMgr->CopyToClipboard(); - } - NS_IF_RELEASE(sink); - NS_RELEASE(parser); - - } - return NS_OK; -} - -#endif // NEW_CLIPBOARD_SUPPORT NS_IMETHODIMP