diff options
| -rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 6 | ||||
| -rw-r--r-- | sc/source/core/data/global.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/view/tabview.cxx | 7 |
3 files changed, 12 insertions, 7 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx index 23233aceb424..db7beb43ed62 100644 --- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx @@ -250,7 +250,8 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget* pDocView, GdkEventConfi rWindow.m_pRowBar->m_aHeaders.clear(); for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("rows")) { - Header aHeader(std::atoi(rValue.second.get<std::string>("size").c_str()), rValue.second.get<std::string>("text")); + 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(nSize, rValue.second.get<std::string>("text")); rWindow.m_pRowBar->m_aHeaders.push_back(aHeader); } gtk_widget_show(rWindow.m_pRowBar->m_pDrawingArea); @@ -259,7 +260,8 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget* pDocView, GdkEventConfi rWindow.m_pColumnBar->m_aHeaders.clear(); for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("columns")) { - Header aHeader(std::atoi(rValue.second.get<std::string>("size").c_str()), rValue.second.get<std::string>("text")); + 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(nSize, rValue.second.get<std::string>("text")); rWindow.m_pColumnBar->m_aHeaders.push_back(aHeader); } gtk_widget_show(rWindow.m_pColumnBar->m_pDrawingArea); diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 90d31e9d2160..c97c02670045 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -545,9 +545,9 @@ void ScGlobal::UpdatePPT( OutputDevice* pDev ) if ( !pDev ) pDev = Application::GetDefaultDevice(); - Point aPix1000 = pDev->LogicToPixel( Point(1000,1000), MAP_TWIP ); - nScreenPPTX = aPix1000.X() / 1000.0; - nScreenPPTY = aPix1000.Y() / 1000.0; + Point aPix1000 = pDev->LogicToPixel( Point(10000,10000), MAP_TWIP ); + nScreenPPTX = aPix1000.X() / 10000.0; + nScreenPPTY = aPix1000.Y() / 10000.0; nPPTZoom = nCurrentZoom; } } diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 7254ff93ecfe..744ccb0ca9ba 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -2289,12 +2289,15 @@ OUString ScTabView::getRowColumnHeaders() SCROW nEndRow = 0; pDoc->GetTiledRenderingArea(aViewData.GetTabNo(), nEndCol, nEndRow); + double nPPTX = aViewData.GetPPTX(); + double nPPTY = aViewData.GetPPTY(); + boost::property_tree::ptree aRows; for (SCROW nRow = 0; nRow <= nEndRow; ++nRow) { boost::property_tree::ptree aRow; sal_uInt16 nSize = pRowBar[SC_SPLIT_BOTTOM]->GetEntrySize(nRow); - aRow.put("size", OString::number(nSize).getStr()); + aRow.put("size", OString::number(nSize / nPPTY).getStr()); OUString aText = pRowBar[SC_SPLIT_BOTTOM]->GetEntryText(nRow); aRow.put("text", aText.toUtf8().getStr()); aRows.push_back(std::make_pair("", aRow)); @@ -2305,7 +2308,7 @@ OUString ScTabView::getRowColumnHeaders() { boost::property_tree::ptree aCol; sal_uInt16 nSize = pColBar[SC_SPLIT_LEFT]->GetEntrySize(nCol); - aCol.put("size", OString::number(nSize).getStr()); + aCol.put("size", OString::number(nSize / nPPTX).getStr()); OUString aText = pColBar[SC_SPLIT_LEFT]->GetEntryText(nCol); aCol.put("text", aText.toUtf8().getStr()); aCols.push_back(std::make_pair("", aCol)); |