diff options
author | Matt A. Tobin <email@mattatobin.com> | 2019-05-29 16:01:50 -0400 |
---|---|---|
committer | Matt A. Tobin <email@mattatobin.com> | 2019-05-29 16:01:50 -0400 |
commit | 363bfeb2c06e5f57136ebdab8da1ebeba0591520 (patch) | |
tree | 3fbaf59efc6807c48a69fabe229be712c0d25af6 /embedding/components/find/nsFind.cpp | |
parent | d197e65f448d0dfbb5de7ff5d09a1aceaf7620f6 (diff) | |
parent | 23115528859e518813214b35c36232da0c1c7b5f (diff) | |
download | UXP-363bfeb2c06e5f57136ebdab8da1ebeba0591520.tar UXP-363bfeb2c06e5f57136ebdab8da1ebeba0591520.tar.gz UXP-363bfeb2c06e5f57136ebdab8da1ebeba0591520.tar.lz UXP-363bfeb2c06e5f57136ebdab8da1ebeba0591520.tar.xz UXP-363bfeb2c06e5f57136ebdab8da1ebeba0591520.zip |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'embedding/components/find/nsFind.cpp')
-rw-r--r-- | embedding/components/find/nsFind.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/embedding/components/find/nsFind.cpp b/embedding/components/find/nsFind.cpp index 6987c11d3..63304dafb 100644 --- a/embedding/components/find/nsFind.cpp +++ b/embedding/components/find/nsFind.cpp @@ -932,7 +932,7 @@ nsFind::ResetAll() // Take nodes out of the tree with NextNode, until null (NextNode will return 0 // at the end of our range). NS_IMETHODIMP -nsFind::Find(const char16_t* aPatText, nsIDOMRange* aSearchRange, +nsFind::Find(const nsAString& aPatText, nsIDOMRange* aSearchRange, nsIDOMRange* aStartPoint, nsIDOMRange* aEndPoint, nsIDOMRange** aRangeRet) { @@ -949,10 +949,6 @@ nsFind::Find(const char16_t* aPatText, nsIDOMRange* aSearchRange, NS_ENSURE_ARG_POINTER(aRangeRet); *aRangeRet = 0; - if (!aPatText) { - return NS_ERROR_NULL_POINTER; - } - ResetAll(); nsAutoString patAutoStr(aPatText); |