starmath/source/ElementsDockingWindow.cxx | 1 - sw/source/ui/vba/vbaapplication.cxx | 4 ++-- toolkit/source/controls/svtxgridcontrol.cxx | 1 - 3 files changed, 2 insertions(+), 4 deletions(-)
New commits: commit b8b9ad9ade866175d8d7f1b68a465060901efee9 Author: Andrea Gelmini <andrea.gelm...@gelma.net> AuthorDate: Sat Aug 6 22:54:04 2022 +0200 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Sun Aug 7 07:27:12 2022 +0200 Removed duplicated includes Change-Id: Ic981e0916c68181cab7081091303d18c54912377 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137912 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 5d7b51de58a6..202396dfc282 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -40,7 +40,6 @@ #include <vcl/virdev.hxx> #include <unordered_map> -#include <utility> namespace { diff --git a/toolkit/source/controls/svtxgridcontrol.cxx b/toolkit/source/controls/svtxgridcontrol.cxx index 1fd7de1f29b1..4911130b9852 100644 --- a/toolkit/source/controls/svtxgridcontrol.cxx +++ b/toolkit/source/controls/svtxgridcontrol.cxx @@ -24,7 +24,6 @@ #include <controls/table/tablecontrol.hxx> #include <controls/table/tablecontrolinterface.hxx> #include <controls/table/gridtablerenderer.hxx> -#include <controls/table/tablecontrol.hxx> #include "unocontroltablemodel.hxx" #include <sal/log.hxx> #include <tools/diagnose_ex.h> commit 30759b5ce2ef4f915a6f4ba50ce25b602162805c Author: Hannah Meeks <hmeeks4...@gmail.com> AuthorDate: Fri Aug 5 12:00:25 2022 +0100 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Sun Aug 7 07:26:56 2022 +0200 VBA conversions inches should be in Change-Id: I130925d9501f8cb4f3f2a8a0894bbf6824cd2eff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137856 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index c95c855c01fd..1a25116448ea 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -448,12 +448,12 @@ float SAL_CALL SwVbaApplication::PointsToPixels( float Pixels, ::sal_Bool fVerti float SAL_CALL SwVbaApplication::InchesToPoints( float Inches ) { - return o3tl::convert(Inches, o3tl::Length::ch, o3tl::Length::pt); + return o3tl::convert(Inches, o3tl::Length::in, o3tl::Length::pt); } float SAL_CALL SwVbaApplication::PointsToInches( float Points ) { - return o3tl::convert(Points, o3tl::Length::pt, o3tl::Length::ch); + return o3tl::convert(Points, o3tl::Length::pt, o3tl::Length::in); } float SAL_CALL SwVbaApplication::MillimetersToPoints( float Millimeters )