cui/source/dialogs/FontFeaturesDialog.cxx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 648edf96cde392545749923dc0c748e0bb31b5f6
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Jan 17 11:02:12 2021 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jan 17 11:53:43 2021 +0100
Try to fix Windows TB
by using std::max<tools::Long> and std::min<tools::Long>
Change-Id: I07c93227cf040f159d1977ca94988169ecd6dc14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109464
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx
b/cui/source/dialogs/FontFeaturesDialog.cxx
index 71c9e34d3e73..333cf1087f05 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -76,9 +76,10 @@ void FontFeaturesDialog::initialize()
fillGrid(rFilteredFontFeatures);
m_xContentWindow->set_size_request(
- -1, std::min(std::max(m_xContentWindow->get_preferred_size().Height(),
- m_xContentGrid->get_preferred_size().Height()),
- 300L));
+ -1,
+
std::min<tools::Long>(std::max<tools::Long>(m_xContentWindow->get_preferred_size().Height(),
+
m_xContentGrid->get_preferred_size().Height()),
+ 300));
updateFontPreview();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
