Kaydet (Commit) 21713893 authored tarafından Miklos Vajna's avatar Miklos Vajna

cid#1340232 uncaught exception

Change-Id: Idb80a055aca67a3fb90aef597ace932f47af8e05
üst ca8a0396
...@@ -307,16 +307,23 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget* pDocView, GdkEventConfi ...@@ -307,16 +307,23 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget* pDocView, GdkEventConfi
gtk_widget_queue_draw(rWindow.m_pRowBar->m_pDrawingArea); gtk_widget_queue_draw(rWindow.m_pRowBar->m_pDrawingArea);
rWindow.m_pColumnBar->m_aHeaders.clear(); 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()))); for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("columns"))
if (nSize >= rWindow.m_pColumnBar->m_nPositionPixel)
{ {
int nScrolledSize = nSize - rWindow.m_pColumnBar->m_nPositionPixel; int nSize = std::round(lok_doc_view_twip_to_pixel(LOK_DOC_VIEW(pDocView), std::atof(rValue.second.get<std::string>("size").c_str())));
Header aHeader(nScrolledSize, rValue.second.get<std::string>("text")); if (nSize >= rWindow.m_pColumnBar->m_nPositionPixel)
rWindow.m_pColumnBar->m_aHeaders.push_back(aHeader); {
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_show(rWindow.m_pColumnBar->m_pDrawingArea);
gtk_widget_queue_draw(rWindow.m_pColumnBar->m_pDrawingArea); gtk_widget_queue_draw(rWindow.m_pColumnBar->m_pDrawingArea);
gtk_widget_show(rWindow.m_pFormulabarEntry); gtk_widget_show(rWindow.m_pFormulabarEntry);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment