ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Fraction->double in SvxXConnectionPreview

Browse Source 
and also avoid allocating these on the heap

Change-Id: I7797fabb2d0d99f3764594846efde6609a669950
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/202601
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2026-03-24 18:40:11 +01:00
parent 67c365fee9
commit 73581d0284
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
svx/source/dialog/connctrl.cxx
+9 -9
View File
@@ -254,25 +254,25 @@ bool SvxXConnectionPreview::MouseButtonDown( const MouseEvent& rMEvt )
MapMode aMapMode = GetMapMode();
Fraction aXFrac = aMapMode.GetScaleX();
Fraction aYFrac = aMapMode.GetScaleY();
std::unique_ptr<Fraction> pMultFrac;
std::optional<double> oMultFrac;
if( bZoomIn )
{
if( bCtrl )
pMultFrac.reset(new Fraction( 3, 2 ));
oMultFrac = 3.0 / 2;
else
pMultFrac.reset(new Fraction( 11, 10 ));
oMultFrac = 11.0 / 10;
}
else
{
if( bCtrl )
pMultFrac.reset(new Fraction( 2, 3 ));
oMultFrac = 2.0 / 3;
else
pMultFrac.reset(new Fraction( 10, 11 ));
oMultFrac = 10.0 / 11;
}
aXFrac *= *pMultFrac;
aYFrac *= *pMultFrac;
aXFrac *= *oMultFrac;
aYFrac *= *oMultFrac;
if( static_cast<double>(aXFrac) > 0.001 && static_cast<double>(aXFrac) < 1000.0 &&
static_cast<double>(aYFrac) > 0.001 && static_cast<double>(aYFrac) < 1000.0 )
{
@@ -284,8 +284,8 @@ bool SvxXConnectionPreview::MouseButtonDown( const MouseEvent& rMEvt )
aOutSize = GetDrawingArea()->get_ref_device().PixelToLogic(aOutSize);
Point aPt( aMapMode.GetOrigin() );
tools::Long nX = static_cast<tools::Long>( ( static_cast<double>(aOutSize.Width()) - ( static_cast<double>(aOutSize.Width()) * static_cast<double>(*pMultFrac) ) ) / 2.0 + 0.5 );
tools::Long nY = static_cast<tools::Long>( ( static_cast<double>(aOutSize.Height()) - ( static_cast<double>(aOutSize.Height()) * static_cast<double>(*pMultFrac) ) ) / 2.0 + 0.5 );
tools::Long nX = static_cast<tools::Long>( ( static_cast<double>(aOutSize.Width()) - ( static_cast<double>(aOutSize.Width()) * *oMultFrac ) ) / 2.0 + 0.5 );
tools::Long nY = static_cast<tools::Long>( ( static_cast<double>(aOutSize.Height()) - ( static_cast<double>(aOutSize.Height()) * *oMultFrac ) ) / 2.0 + 0.5 );
aPt.AdjustX(nX );
aPt.AdjustY(nY );