summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorJustin Luth <jluth@mail.com>2023-05-19 15:59:13 -0400
committerJustin Luth <jluth@mail.com>2023-05-20 20:08:52 +0200
commitfc15f483988622b8e3ea2a97c9a8593f2beb18fb (patch)
tree0aea88fb26f46f9e18e6cc7c480a5aff01be283d /sd
parent4536694edb7e564ea1f4ae871e9107f52ed0972f (diff)
tdf#139512: partial revert default row height on new sd tables
Back in 5.0, a regression caused the cell height to ignore the font height for any empty rows. Well, of course all rows are empty for a new table, so the table was created with only a super tiny row height. That 5.0 regression was properly fixed in 7.4.2 with tdf#144092, so the height of new rows should automatically be appropriate for the current font size. (It was already somewhat fixed in 5.1.1 - enough for this bug.) Thus, we can revert back to the original default size (200), since there were complaints that my default size (2000) was too big. In practice, each row height will be approximately 750, since Draw/Impress always create tables with 18pt font size. 200 is appropriate for 4pt font. Change-Id: Ic03d94ea3557581fd96613a408ab233b2c2c6a7c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152021 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/qa/uitest/impress_tests2/tdf139511.py2
-rw-r--r--sd/source/ui/table/tablefunction.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sd/qa/uitest/impress_tests2/tdf139511.py b/sd/qa/uitest/impress_tests2/tdf139511.py
index 80410d3dc5b5..52e54d291516 100644
--- a/sd/qa/uitest/impress_tests2/tdf139511.py
+++ b/sd/qa/uitest/impress_tests2/tdf139511.py
@@ -23,7 +23,7 @@ class tdf139511(UITestCase):
self.xUITest.executeCommand(".uno:InsertTable?Columns:short=4&Rows:short=4")
- self.assertEqual(8036, document.DrawPages[0].getByIndex(2).BoundRect.Height)
+ self.assertEqual(3885, document.DrawPages[0].getByIndex(2).BoundRect.Height)
self.assertEqual(14136, document.DrawPages[0].getByIndex(2).BoundRect.Width)
with self.ui_test.execute_dialog_through_command(".uno:TransformDialog") as xDialog:
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index 14080fafbbc0..67196e864b39 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -102,7 +102,7 @@ static void InsertTableImpl(const DrawViewShell* pShell,
}
else
{
- Size aSize( 14100, 2000 );
+ Size aSize(14100, 200);
Point aPos;
::tools::Rectangle aWinRect(aPos, pShell->GetActiveWindow()->GetOutputSizePixel());