summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-11-26 09:27:47 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-11-26 09:45:45 +0100
commit21713893a4a4ac199d0bf3edb00a1c50082b03d8 (patch)
treeaf58b043ccb9cb4405900ee86784c004cc3ba8c7
parentca8a0396443be9351d673559ad38776f45340d57 (diff)
cid#1340232 uncaught exception
Change-Id: Idb80a055aca67a3fb90aef597ace932f47af8e05
-rw-r--r--libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx19
1 files changed, 13 insertions, 6 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 2364ea1bcbe2..fee52665dcc4 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -307,16 +307,23 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget* pDocView, GdkEventConfi
gtk_widget_queue_draw(rWindow.m_pRowBar->m_pDrawingArea);
rWindow.m_pColumnBar->m_aHeaders.clear();
- for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("columns"))
+ 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_pColumnBar->m_nPositionPixel)
+ for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("columns"))
{
- int nScrolledSize = nSize - rWindow.m_pColumnBar->m_nPositionPixel;
- Header aHeader(nScrolledSize, rValue.second.get<std::string>("text"));
- rWindow.m_pColumnBar->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_pColumnBar->m_nPositionPixel)
+ {
+ int nScrolledSize = nSize - rWindow.m_pColumnBar->m_nPositionPixel;
+ Header aHeader(nScrolledSize, rValue.second.get<std::string>("text"));
+ rWindow.m_pColumnBar->m_aHeaders.push_back(aHeader);
+ }
}
}
+ catch (boost::property_tree::ptree_bad_path& rException)
+ {
+ std::cerr << "TiledRowColumnBar::docConfigureEvent: failed to get columns: " << rException.what() << std::endl;
+ }
gtk_widget_show(rWindow.m_pColumnBar->m_pDrawingArea);
gtk_widget_queue_draw(rWindow.m_pColumnBar->m_pDrawingArea);
gtk_widget_show(rWindow.m_pFormulabarEntry);