diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-26 09:27:36 +0100 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-12 22:06:40 -0400 |
| commit | 07e4e6ab409ef5c2df0e261de1a73f9169b34c43 (patch) | |
| tree | e74e515badaf4c6e945bb20472745c719400a32c /libreofficekit | |
| parent | a3456e669280f68455f4a1cba9a7d05b6b0c3609 (diff) | |
cid#1340231 uncaught exception
Change-Id: I69f2078093c2c23ae0a02a6a292e51fdbdde9ed4
(cherry picked from commit ca8a0396443be9351d673559ad38776f45340d57)
Diffstat (limited to 'libreofficekit')
| -rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx index 2686148fd091..335d09acf0b8 100644 --- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx @@ -290,16 +290,23 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget* pDocView, GdkEventConfi gtk_widget_show(rWindow.m_pCornerButton->m_pDrawingArea); rWindow.m_pRowBar->m_aHeaders.clear(); - for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("rows")) + try { - int nSize = std::round(lok_doc_view_twip_to_pixel(LOK_DOC_VIEW(pDocView), std::atof(rValue.second.get<std::string>("size").c_str()))); - if (nSize >= rWindow.m_pRowBar->m_nPositionPixel) + for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("rows")) { - int nScrolledSize = nSize - rWindow.m_pRowBar->m_nPositionPixel; - Header aHeader(nScrolledSize, rValue.second.get<std::string>("text")); - rWindow.m_pRowBar->m_aHeaders.push_back(aHeader); + int nSize = std::round(lok_doc_view_twip_to_pixel(LOK_DOC_VIEW(pDocView), std::atof(rValue.second.get<std::string>("size").c_str()))); + if (nSize >= rWindow.m_pRowBar->m_nPositionPixel) + { + int nScrolledSize = nSize - rWindow.m_pRowBar->m_nPositionPixel; + Header aHeader(nScrolledSize, rValue.second.get<std::string>("text")); + rWindow.m_pRowBar->m_aHeaders.push_back(aHeader); + } } } + catch (boost::property_tree::ptree_bad_path& rException) + { + std::cerr << "TiledRowColumnBar::docConfigureEvent: failed to get rows: " << rException.what() << std::endl; + } gtk_widget_show(rWindow.m_pRowBar->m_pDrawingArea); gtk_widget_queue_draw(rWindow.m_pRowBar->m_pDrawingArea); |