summaryrefslogtreecommitdiffstats
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:16:56 +0100
commit66bbf08f08dafe38c02edbca11ca01e7906d4b81 (patch)
tree55573da535ab3cbeef748014cc8e530f9baf861f /desktop
parenttdf#128733 Chart import: fix secondary X axis (diff)
downloadcore-66bbf08f08dafe38c02edbca11ca01e7906d4b81.tar.gz
core-66bbf08f08dafe38c02edbca11ca01e7906d4b81.zip
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/82572 Tested-by: Jenkins 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 e6207b2cf98a..2c2d03b967ea 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -709,6 +709,7 @@ void DesktopLOKTest::testRowColumnHeaders()
for (const 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)
@@ -737,6 +738,7 @@ void DesktopLOKTest::testRowColumnHeaders()
for (const 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)
{