wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 484143 -- Remove AOLCiter, based on a patch by Phil Ringnalda <philringnalda@gmail.com>, r+sr=roc

Browse Source
This commit is contained in:
Siddharth Agarwal 2009-04-05 22:10:43 +05:30
parent 8312e171d1
commit 50384d30a3
6 changed files with 3 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/libeditor/html/nsHTMLDataTransfer.cpp
View File

@ -87,8 +87,6 @@
#include "nsIParser.h" #include "nsIParser.h"
#include "nsParserCIID.h" #include "nsParserCIID.h"
#include "nsIImage.h" #include "nsIImage.h"
#include "nsAOLCiter.h"
#include "nsInternetCiter.h"
#include "nsXPCOM.h" #include "nsXPCOM.h"
#include "nsISupportsPrimitives.h" #include "nsISupportsPrimitives.h"
#include "nsLinebreakConverter.h" #include "nsLinebreakConverter.h"

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

@ -97,8 +97,6 @@
#include "nsIPresShell.h" #include "nsIPresShell.h"
#include "nsPresContext.h" #include "nsPresContext.h"
#include "nsIImage.h" #include "nsIImage.h"
#include "nsAOLCiter.h"
#include "nsInternetCiter.h"
#include "nsXPCOM.h" #include "nsXPCOM.h"
#include "nsISupportsPrimitives.h" #include "nsISupportsPrimitives.h"
#include "SetDocTitleTxn.h" #include "SetDocTitleTxn.h"

1
editor/libeditor/text/Makefile.in
View File

@ -76,7 +76,6 @@ CPPSRCS = \
nsEditorEventListeners.cpp \ nsEditorEventListeners.cpp \
nsWrapUtils.cpp \ nsWrapUtils.cpp \
nsInternetCiter.cpp \ nsInternetCiter.cpp \
nsAOLCiter.cpp \
nsTextEditRulesBidi.cpp \ nsTextEditRulesBidi.cpp \
$(NULL) $(NULL)

111
editor/libeditor/text/nsAOLCiter.cpp
View File

@ -1,111 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsAOLCiter.h"
#include "nsWrapUtils.h"
#include "nsReadableUtils.h"
#include "nsCRT.h"
/** Mail citations using the AOL style >> This is a citation <<
*/
nsAOLCiter::nsAOLCiter()
{
}
nsAOLCiter::~nsAOLCiter()
{
}
NS_IMPL_ISUPPORTS1(nsAOLCiter, nsICiter)
NS_IMETHODIMP
nsAOLCiter::GetCiteString(const nsAString& aInString, nsAString& aOutString)
{
aOutString.AssignLiteral("\n\n>> ");
aOutString += aInString;
// See if the last char is a newline, and replace it if so
PRUnichar newline ('\n');
if (aOutString.Last() == newline)
{
aOutString.SetLength(aOutString.Length() - 1);
}
aOutString.AppendLiteral(" <<\n");
return NS_OK;
}
NS_IMETHODIMP
nsAOLCiter::StripCites(const nsAString& aInString, nsAString& aOutString)
{
// Remove the beginning cites, if any:
nsAutoString tOutputString;
nsReadingIterator <PRUnichar> iter, enditer;
aInString.BeginReading(iter);
aInString.EndReading(enditer);
if (StringBeginsWith(aInString, NS_LITERAL_STRING(">>")))
{
iter.advance(2);
while (nsCRT::IsAsciiSpace(*iter))
++iter;
AppendUnicodeTo(iter, enditer, tOutputString);
}
else
CopyUnicodeTo(iter, enditer, tOutputString);
// Remove the end cites, if any:
tOutputString.Trim("<", PR_FALSE, PR_TRUE, PR_FALSE);
aOutString.Assign(tOutputString);
return NS_OK;
}
NS_IMETHODIMP
nsAOLCiter::Rewrap(const nsAString& aInString,
PRUint32 aWrapCol, PRUint32 aFirstLineOffset,
PRBool aRespectNewlines,
nsAString& aOutString)
{
nsString citeString;
return nsWrapUtils::Rewrap(aInString, aWrapCol, aFirstLineOffset,
aRespectNewlines, citeString,
aOutString);
}

67
editor/libeditor/text/nsAOLCiter.h
View File

@ -1,67 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef nsAOLCiter_h__
#define nsAOLCiter_h__
#include "nsString.h"
#include "nsICiter.h"
/** Mail citations using the AOL style >> This is a citation <<
*/
class nsAOLCiter : public nsICiter
{
public:
nsAOLCiter();
virtual ~nsAOLCiter();
//Interfaces for addref and release and queryinterface
//NOTE: Use NS_DECL_ISUPPORTS_INHERITED in any class inherited from nsEditor
NS_DECL_ISUPPORTS
NS_IMETHOD GetCiteString(const nsAString & aInString, nsAString & aOutString);
NS_IMETHOD StripCites(const nsAString & aInString, nsAString & aOutString);
NS_IMETHOD Rewrap(const nsAString & aInString,
PRUint32 aWrapCol, PRUint32 aFirstLineOffset,
PRBool aRespectNewlines,
nsAString & aOutString);
};
#endif //nsAOLCiter_h__

33
editor/libeditor/text/nsPlaintextEditor.cpp
View File

@ -76,7 +76,6 @@
#include "nsIPrefService.h" #include "nsIPrefService.h"
#include "nsUnicharUtils.h" #include "nsUnicharUtils.h"
#include "nsContentCID.h" #include "nsContentCID.h"
#include "nsAOLCiter.h"
#include "nsInternetCiter.h" #include "nsInternetCiter.h"
#include "nsEventDispatcher.h" #include "nsEventDispatcher.h"
#include "nsGkAtoms.h" #include "nsGkAtoms.h"
@ -1467,38 +1466,12 @@ nsPlaintextEditor::PasteAsQuotation(PRInt32 aSelectionType)
return rv; return rv;
} }
// Utility routine to make a new citer. This addrefs, of course.
static nsICiter* MakeACiter()
{
// Make a citer of an appropriate type
nsICiter* citer = 0;
nsresult rv;
nsCOMPtr<nsIPrefBranch> prefBranch =
do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
if (NS_FAILED(rv)) return 0;
char *citationType = 0;
rv = prefBranch->GetCharPref("mail.compose.citationType", &citationType);
if (NS_SUCCEEDED(rv) && citationType[0] && !strncmp(citationType, "aol", 3))
citer = new nsAOLCiter;
else
citer = new nsInternetCiter;
if (citationType)
PL_strfree(citationType);
if (citer)
NS_ADDREF(citer);
return citer;
}
NS_IMETHODIMP NS_IMETHODIMP
nsPlaintextEditor::InsertAsQuotation(const nsAString& aQuotedText, nsPlaintextEditor::InsertAsQuotation(const nsAString& aQuotedText,
nsIDOMNode **aNodeInserted) nsIDOMNode **aNodeInserted)
{ {
// We have the text. Cite it appropriately: // We have the text. Cite it appropriately:
nsCOMPtr<nsICiter> citer = dont_AddRef(MakeACiter()); nsCOMPtr<nsICiter> citer = new nsInternetCiter();
// Let the citer quote it for us: // Let the citer quote it for us:
nsString quotedStuff; nsString quotedStuff;
@ -1600,7 +1573,7 @@ nsPlaintextEditor::Rewrap(PRBool aRespectNewlines)
&isCollapsed, current); &isCollapsed, current);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsICiter> citer = dont_AddRef(MakeACiter()); nsCOMPtr<nsICiter> citer = new nsInternetCiter();
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
if (!citer) return NS_ERROR_UNEXPECTED; if (!citer) return NS_ERROR_UNEXPECTED;
@ -1629,7 +1602,7 @@ nsPlaintextEditor::StripCites()
&isCollapsed, current); &isCollapsed, current);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsICiter> citer = dont_AddRef(MakeACiter()); nsCOMPtr<nsICiter> citer = new nsInternetCiter();
if (!citer) return NS_ERROR_UNEXPECTED; if (!citer) return NS_ERROR_UNEXPECTED;
nsString stripped; nsString stripped;