sc/source/ui/vba/vbaapplication.cxx | 5 ++--- sc/source/ui/vba/vbaapplication.hxx | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)
New commits: commit 20c7df24b2df57f4bbd62d08cc759ad62d6512ce Author: Baole Fang <baole.f...@gmail.com> AuthorDate: Tue Mar 14 11:13:59 2023 -0400 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Wed Mar 15 05:38:20 2023 +0000 Refactor InchesToPoints in Calc Change-Id: I379e41ce0a16e1e02b2e4426525657c751e945dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148890 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 59088788b4d7..d9e5ba984f5a 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -1329,11 +1329,10 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Union( return lclCreateVbaRange( mxContext, getCurrentDocument(), aList ); } -double +double SAL_CALL ScVbaApplication::InchesToPoints( double Inches ) { - double result = Inches * 72.0; - return result; + return o3tl::convert(Inches, o3tl::Length::in, o3tl::Length::pt); } double SAL_CALL diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index 3c0ed903f9d1..4a049100b608 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -143,7 +143,7 @@ public: virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) override; virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) override; virtual double SAL_CALL CentimetersToPoints( double Centimeters ) override; - virtual double SAL_CALL InchesToPoints( double InchesToPoints ) override; + virtual double SAL_CALL InchesToPoints( double Inches ) override; virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) override; virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) override; virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) override;