summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2019-11-09 18:18:15 +0000
committerMichael Meeks <michael.meeks@collabora.com>2019-11-13 11:15:59 +0100
commitd5786f64fcba4b41e908714312046052bf70a3c9 (patch)
treee92961e85c0bc06207f49d44365fa0f8a276fc51 /desktop
parentc8822da749e3720ad99f21ea9bb7a0b035a4b859 (diff)
lok: calc: switch row / column / grouping data to pixels.
This simplifies lots of logic in the clients, making it trivial to get good row/column header alignment at any zoom. Ultimately TWIPS here are highly misleading print-twips, and in this state are ~impossible to map to pixels accurately unless all data is present back to the origin (which is not the current approach). Change-Id: I6ca30e77865b62e886e23860f7c23350e544c9fc Reviewed-on: https://gerrit.libreoffice.org/82555 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/qa/desktop_lib/test_desktop_lib.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 1810df911b06..f9ef935c4c62 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -712,6 +712,7 @@ void DesktopLOKTest::testRowColumnHeaders()
for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("rows"))
{
sal_Int32 nSize = OString(rValue.second.get<std::string>("size").c_str()).toInt32();
+ nSize *= 15; /* TWIPS_PER_PIXEL */
OString aText(rValue.second.get<std::string>("text").c_str());
if (bFirstHeader)
@@ -740,6 +741,7 @@ void DesktopLOKTest::testRowColumnHeaders()
for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("columns"))
{
sal_Int32 nSize = OString(rValue.second.get<std::string>("size").c_str()).toInt32();
+ nSize *= 15; /* TWIPS_PER_PIXEL */
OString aText(rValue.second.get<std::string>("text").c_str());
if (bFirstHeader)
{