Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

author = ashuk

Browse Source 
r = edburns
a = edburns

Fix for Bugs: 44774, 44775 and 41780


git-svn-id: svn://10.0.0.236/trunk@74690 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ashuk%eng.sun.com
2000-07-24 21:15:03 +00:00
parent 5f741e9c79
commit 711d526c7d
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/java/webclient/src_moz/CurrentPageImpl.cpp
View File

@@ -71,6 +71,12 @@ JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_CurrentPageImp
nsIContentViewer* contentViewer ;
nsresult rv = nsnull;
rv = initContext->docShell->GetContentViewer(&contentViewer);
if (NS_FAILED(rv)) {
initContext->initFailCode = kGetContentViewerError;
::util_ThrowExceptionToJava(env, "Exception: cant get ContentViewer from DocShell");
return;
}
nsCOMPtr<nsIContentViewerEdit> contentViewerEdit(do_QueryInterface(contentViewer));
rv = contentViewerEdit->CopySelection();
@@ -101,7 +107,11 @@ JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_CurrentPageImp
nsCOMPtr<nsIInterfaceRequestor> interfaceRequestor(do_QueryInterface(initContext->docShell));
nsCOMPtr<nsIDOMWindow> domWindow;
rv = interfaceRequestor->GetInterface(NS_GET_IID(nsIDOMWindow), getter_AddRefs(domWindow));
if (NS_FAILED(rv)) {
initContext->initFailCode = kGetDOMWindowError;
::util_ThrowExceptionToJava(env, "Exception: cant get DOMWindow from DocShell");
return;
}
nsCOMPtr<nsISupports> searchContext;
rv = findComponent->CreateContext(domWindow, nsnull, getter_AddRefs(searchContext));
@@ -111,7 +121,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_CurrentPageImp
return;
}
nsCOMPtr<nsISearchContext> srchcontext;
nsCOMPtr<nsISearchContext> srchcontext;
rv = searchContext->QueryInterface(NS_GET_IID(nsISearchContext), getter_AddRefs(srchcontext));
if (NS_FAILED(rv)) {
initContext->initFailCode = kSearchContextError;
@@ -124,6 +134,12 @@ JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_CurrentPageImp
PRUnichar * srchString = (PRUnichar *) ::util_GetStringChars(env, searchString);
// Check if String is NULL
if (nsnull == srchString) {
::util_ThrowExceptionToJava(env, "Exception: NULL String passed to Find call");
return;
}
srchcontext->SetSearchString(srchString);
srchcontext->SetSearchBackwards(!forward);
srchcontext->SetCaseSensitive(matchCase);
@@ -320,6 +336,12 @@ JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_CurrentPageImp
nsIContentViewer* contentViewer ;
nsresult rv = nsnull;
rv = initContext->docShell->GetContentViewer(&contentViewer);
if (NS_FAILED(rv)) {
initContext->initFailCode = kGetContentViewerError;
::util_ThrowExceptionToJava(env, "Exception: cant get ContentViewer from DocShell");
return;
}
nsCOMPtr<nsIContentViewerEdit> contentViewerEdit(do_QueryInterface(contentViewer));
rv = contentViewerEdit->SelectAll();
if (NS_FAILED(rv)) {