diff options
author | Marco Pesenti Gritti <marco@gnome.org> | 2005-02-04 12:18:26 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2005-02-04 12:18:26 (GMT) |
commit | 1cb865554fcb40760784a30c7700b6a751567762 (patch) | |
tree | 38864ca275068726b29186065f5546ae5a8dd267 /pdf | |
parent | 826131fb75fadb602b375ba29e593d1e0ab3dde8 (diff) |
Fix several bugs with find
2005-02-04 Marco Pesenti Gritti <marco@gnome.org>
* backend/ev-document-find.c: (ev_document_find_changed):
* backend/ev-document-find.h:
* pdf/xpdf/pdf-document.cc:
* shell/ev-view.c: (jump_to_find_result), (ev_view_set_document):
* shell/ev-window.c: (find_bar_search_changed_cb):
Fix several bugs with find
Diffstat (limited to 'pdf')
-rw-r--r-- | pdf/xpdf/pdf-document.cc | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pdf/xpdf/pdf-document.cc b/pdf/xpdf/pdf-document.cc index 1855222..255c5ab 100644 --- a/pdf/xpdf/pdf-document.cc +++ b/pdf/xpdf/pdf-document.cc @@ -413,12 +413,18 @@ pdf_document_render (EvDocument *document, double pdf_document_find_get_progress (EvDocumentFind *document_find) { - PdfDocumentSearch *search = PDF_DOCUMENT (document_find)->search; + PdfDocumentSearch *search; int n_pages, pages_done; - + + search = PDF_DOCUMENT (document_find)->search; + + if (search == NULL) { + return 0; + } + n_pages = ev_document_get_n_pages (EV_DOCUMENT (document_find)); if (search->search_page > search->start_page) { - pages_done = search->search_page - search->start_page; + pages_done = search->search_page - search->start_page + 1; } else if (search->search_page == search->start_page) { pages_done = n_pages; } else { @@ -460,7 +466,8 @@ pdf_document_find_get_result (EvDocumentFind *document_find, PdfDocumentSearch *search = pdf_document->search; GdkRectangle r; - if (search != NULL) { + if (search != NULL && + n_result < search->current_page_results->len) { r = g_array_index (search->current_page_results, GdkRectangle, n_result); @@ -655,7 +662,7 @@ pdf_document_find_begin (EvDocumentFind *document, } static void -pdf_document_find_cancel (EvDocumentFind *document) +pdf_document_find_cancel (EvDocumentFind *document) { PdfDocument *pdf_document = PDF_DOCUMENT (document); @@ -1136,6 +1143,7 @@ pdf_document_find_iface_init (EvDocumentFindIface *iface) iface->get_n_results = pdf_document_find_get_n_results; iface->get_result = pdf_document_find_get_result; iface->page_has_results = pdf_document_find_page_has_results; + iface->get_progress = pdf_document_find_get_progress; iface->cancel = pdf_document_find_cancel; } |