diff --git a/editor/libeditor/HTMLEditorDataTransfer.cpp b/editor/libeditor/HTMLEditorDataTransfer.cpp index 5b12f1b90e0f..80961e7387b3 100644 --- a/editor/libeditor/HTMLEditorDataTransfer.cpp +++ b/editor/libeditor/HTMLEditorDataTransfer.cpp @@ -1862,12 +1862,6 @@ HTMLEditor::InsertAsPlaintextQuotation(const nsAString& aQuotedText, return rv; } -NS_IMETHODIMP -HTMLEditor::StripCites() -{ - return TextEditor::StripCites(); -} - NS_IMETHODIMP HTMLEditor::Rewrap(bool aRespectNewlines) { diff --git a/editor/libeditor/InternetCiter.cpp b/editor/libeditor/InternetCiter.cpp index 89b07c9d6eb9..9d9bbb944e75 100644 --- a/editor/libeditor/InternetCiter.cpp +++ b/editor/libeditor/InternetCiter.cpp @@ -67,59 +67,6 @@ InternetCiter::GetCiteString(const nsAString& aInString, return NS_OK; } -nsresult -InternetCiter::StripCitesAndLinebreaks(const nsAString& aInString, - nsAString& aOutString, - bool aLinebreaksToo, - int32_t* aCiteLevel) -{ - if (aCiteLevel) { - *aCiteLevel = 0; - } - - aOutString.Truncate(); - nsReadingIterator beginIter,endIter; - aInString.BeginReading(beginIter); - aInString.EndReading(endIter); - while (beginIter!= endIter) { // loop over lines - // Clear out cites first, at the beginning of the line: - int32_t thisLineCiteLevel = 0; - while (beginIter!= endIter && - (*beginIter == gt || nsCRT::IsAsciiSpace(*beginIter))) { - if (*beginIter == gt) { - ++thisLineCiteLevel; - } - ++beginIter; - } - // Now copy characters until line end: - while (beginIter != endIter && (*beginIter != '\r' && *beginIter != '\n')) { - aOutString.Append(*beginIter); - ++beginIter; - } - if (aLinebreaksToo) { - aOutString.Append(char16_t(' ')); - } else { - aOutString.Append(char16_t('\n')); // DOM linebreaks, not NS_LINEBREAK - } - // Skip over any more consecutive linebreak-like characters: - while (beginIter != endIter && (*beginIter == '\r' || *beginIter == '\n')) { - ++beginIter; - } - // Done with this line -- update cite level - if (aCiteLevel && (thisLineCiteLevel > *aCiteLevel)) { - *aCiteLevel = thisLineCiteLevel; - } - } - return NS_OK; -} - -nsresult -InternetCiter::StripCites(const nsAString& aInString, - nsAString& aOutString) -{ - return StripCitesAndLinebreaks(aInString, aOutString, false, 0); -} - static void AddCite(nsAString& aOutString, int32_t citeLevel) { for (int32_t i = 0; i < citeLevel; ++i) { diff --git a/editor/libeditor/InternetCiter.h b/editor/libeditor/InternetCiter.h index d1a861678bb7..32dc0e1637fc 100644 --- a/editor/libeditor/InternetCiter.h +++ b/editor/libeditor/InternetCiter.h @@ -20,19 +20,10 @@ public: static nsresult GetCiteString(const nsAString& aInString, nsAString& aOutString); - static nsresult StripCites(const nsAString& aInString, - nsAString& aOutString); - static nsresult Rewrap(const nsAString& aInString, uint32_t aWrapCol, uint32_t aFirstLineOffset, bool aRespectNewlines, nsAString& aOutString); - -protected: - static nsresult StripCitesAndLinebreaks(const nsAString& aInString, - nsAString& aOutString, - bool aLinebreaksToo, - int32_t* aCiteLevel); }; } // namespace mozilla diff --git a/editor/libeditor/TextEditor.cpp b/editor/libeditor/TextEditor.cpp index 4686d94d239c..17835b3d54bb 100644 --- a/editor/libeditor/TextEditor.cpp +++ b/editor/libeditor/TextEditor.cpp @@ -1998,33 +1998,6 @@ TextEditor::Rewrap(bool aRespectNewlines) return InsertTextWithQuotations(wrapped); } -NS_IMETHODIMP -TextEditor::StripCites() -{ - nsAutoString current; - bool isCollapsed; - nsresult rv = SharedOutputString(nsIDocumentEncoder::OutputFormatted, - &isCollapsed, current); - NS_ENSURE_SUCCESS(rv, rv); - - nsString stripped; - rv = InternetCiter::StripCites(current, stripped); - NS_ENSURE_SUCCESS(rv, rv); - - if (isCollapsed) { - rv = SelectAllInternal(); - if (NS_WARN_IF(NS_FAILED(rv))) { - return rv; - } - } - - rv = InsertTextAsAction(stripped); - if (NS_WARN_IF(NS_FAILED(rv))) { - return rv; - } - return NS_OK; -} - NS_IMETHODIMP TextEditor::GetEmbeddedObjects(nsIArray** aNodeList) { diff --git a/editor/nsIEditorMailSupport.idl b/editor/nsIEditorMailSupport.idl index c1961b1ab8db..1667fc2fc3bb 100644 --- a/editor/nsIEditorMailSupport.idl +++ b/editor/nsIEditorMailSupport.idl @@ -59,12 +59,6 @@ interface nsIEditorMailSupport : nsISupports */ void rewrap(in boolean aRespectNewlines); - /** - * Strip any citations in the selected part of the document. - */ - void stripCites(); - - /** * Get a list of IMG and OBJECT tags in the current document. */