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

Bug 1491191 - Remove unused methods in nsIEditorMailSupport. r=masayuki

Browse Source 
Since I have landed bug 1489939, comm-central only uses rewrap method in
nsIEditorMailSupport.  And insertAsCitedQuotation is used by the test of
editor/libeditor/tests/test_bug616590.xul.

Other methods are unused now, so let's remove these from nsIEditorMailSupprt,
and move it to HTMLEditor.  Also, pasteAsQuotation is unused now even if
BlueGriffon.

Differential Revision: https://phabricator.services.mozilla.com/D5835

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Makoto Kato 2018-09-14 10:03:24 +00:00
parent 7dc58d65e7
commit f3b8a60bde
3 changed files with 24 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
editor/libeditor/HTMLEditor.h
View File

@ -452,6 +452,28 @@ public:
*/
Element* GetActiveEditingHost() const;
/** Insert a string as quoted text
* (whose representation is dependant on the editor type),
* replacing the selected text (if any).
*
* @param aQuotedText The actual text to be quoted
* @parem aNodeInserted Return the node which was inserted.
*/
nsresult InsertAsQuotation(const nsAString& aQuotedText,
nsINode** aNodeInserted);
/**
* Inserts a plaintext string at the current location,
* with special processing for lines beginning with ">",
* which will be treated as mail quotes and inserted
* as plaintext quoted blocks.
* If the selection is not collapsed, the selection is deleted
* and the insertion takes place at the resulting collapsed selection.
*
* @param aString the string to be inserted
*/
nsresult InsertTextWithQuotations(const nsAString& aStringToInsert);
protected: // May be called by friends.
/****************************************************************************
* Some classes like TextEditRules, HTMLEditRules, WSRunObject which are

14
editor/libeditor/HTMLEditorDataTransfer.cpp
View File

@ -1669,16 +1669,6 @@ HTMLEditor::CanPasteTransferable(nsITransferable* aTransferable)
return false;
}
NS_IMETHODIMP
HTMLEditor::PasteAsQuotation(int32_t aClipboardType)
{
if (NS_WARN_IF(aClipboardType != nsIClipboard::kGlobalClipboard &&
aClipboardType != nsIClipboard::kSelectionClipboard)) {
return NS_ERROR_INVALID_ARG;
}
return HTMLEditor::PasteAsQuotationAsAction(aClipboardType);
}
nsresult
HTMLEditor::PasteAsQuotationAsAction(int32_t aClipboardType)
{
@ -1790,7 +1780,7 @@ HTMLEditor::PasteAsPlaintextQuotation(int32_t aSelectionType)
return rv;
}
NS_IMETHODIMP
nsresult
HTMLEditor::InsertTextWithQuotations(const nsAString& aStringToInsert)
{
// The whole operation should be undoable in one transaction:
@ -1895,7 +1885,7 @@ HTMLEditor::InsertTextWithQuotationsInternal(const nsAString& aStringToInsert)
return rv;
}
NS_IMETHODIMP
nsresult
HTMLEditor::InsertAsQuotation(const nsAString& aQuotedText,
nsINode** aNodeInserted)
{

27
editor/nsIEditorMailSupport.idl
View File

@ -13,33 +13,6 @@ webidl Node;
interface nsIEditorMailSupport : nsISupports
{
/** Paste the text in the OS clipboard at the cursor position,
* as a quotation (whose representation is dependant on the editor type),
* replacing the selected text (if any).
* @param aSelectionType Text or html?
*/
void pasteAsQuotation(in long aSelectionType);
/** Insert a string as quoted text
* (whose representation is dependant on the editor type),
* replacing the selected text (if any).
* @param aQuotedText The actual text to be quoted
* @return The node which was inserted
*/
Node insertAsQuotation(in AString aQuotedText);
/**
* Inserts a plaintext string at the current location,
* with special processing for lines beginning with ">",
* which will be treated as mail quotes and inserted
* as plaintext quoted blocks.
* If the selection is not collapsed, the selection is deleted
* and the insertion takes place at the resulting collapsed selection.
*
* @param aString the string to be inserted
*/
void insertTextWithQuotations(in DOMString aStringToInsert);
/** Insert a string as quoted text
* (whose representation is dependant on the editor type),
* replacing the selected text (if any),