ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

cid#1689887 silence Division or modulo by float zero

Browse Source 
and

cid#1689888 Division or modulo by float zero
cid#1689889 Division or modulo by float zero
cid#1689883 Division or modulo by float zero

Change-Id: I09240c21caca0fa58043162e94172ddff733114d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/202275
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara
2026-03-21 11:56:28 +01:00
parent bcedaf700b
commit 23e2a87a0a
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc/source/ui/view/drawvie4.cxx
+7 -4
View File
@@ -494,10 +494,13 @@ void ScDrawView::SetMarkedOriginalSize()
{
tools::Rectangle aDrawRect = pObj->GetLogicRect();
pUndoGroup->AddAction( std::make_unique<SdrUndoGeoObj>( *pObj ) );
pObj->Resize( aDrawRect.TopLeft(), double( aOriginalSize.Width() ) / aDrawRect.GetWidth(),
double( aOriginalSize.Height() ) / aDrawRect.GetHeight() );
++nDone;
if (aDrawRect.GetWidth() && aDrawRect.GetHeight())
{
pUndoGroup->AddAction( std::make_unique<SdrUndoGeoObj>( *pObj ) );
pObj->Resize( aDrawRect.TopLeft(), double( aOriginalSize.Width() ) / aDrawRect.GetWidth(),
double( aOriginalSize.Height() ) / aDrawRect.GetHeight() );
++nDone;
}
}
}
sc/source/ui/view/tabvwshh.cxx
+2 -2
View File
@@ -111,11 +111,11 @@ void ScTabViewShell::ExecuteObject( const SfxRequest& rReq )
pDrView->MoveMarkedObj( Size( nNewVal - aRect.Left(), 0 ) );
else if ( nSlotId == SID_OBJECT_TOP )
pDrView->MoveMarkedObj( Size( 0, nNewVal - aRect.Top() ) );
else if ( nSlotId == SID_OBJECT_WIDTH )
else if ( nSlotId == SID_OBJECT_WIDTH && aRect.GetWidth() )
pDrView->ResizeMarkedObj( aRect.TopLeft(),
double(nNewVal) / aRect.GetWidth(),
1.0 );
else // if ( nSlotId == SID_OBJECT_HEIGHT )
else if ( nSlotId == SID_OBJECT_HEIGHT && aRect.GetHeight() )
pDrView->ResizeMarkedObj( aRect.TopLeft(),
1.0,
double(nNewVal) / aRect.GetHeight() );
sd/source/ui/view/sdview.cxx
+6 -3
View File
@@ -918,9 +918,12 @@ void View::SetMarkedOriginalSize()
{
::tools::Rectangle aDrawRect( pObj->GetLogicRect() );
pUndoGroup->AddAction( mrDoc.GetSdrUndoFactory().CreateUndoGeoObject( *pObj ) );
pObj->Resize( aDrawRect.TopLeft(), double( aOleSize.Width() ) / aDrawRect.GetWidth(),
double( aOleSize.Height() ) / aDrawRect.GetHeight() );
if (aDrawRect.GetWidth() && aDrawRect.GetHeight())
{
pUndoGroup->AddAction( mrDoc.GetSdrUndoFactory().CreateUndoGeoObject( *pObj ) );
pObj->Resize( aDrawRect.TopLeft(), double( aOleSize.Width() ) / aDrawRect.GetWidth(),
double( aOleSize.Height() ) / aDrawRect.GetHeight() );
}
}
}
}
sw/source/core/layout/anchoreddrawobject.cxx
+2 -1
View File
@@ -737,7 +737,8 @@ SwRect SwAnchoredDrawObject::GetObjBoundRect() const
nTargetHeight = nHeight * (*GetDrawObj()->GetRelativeHeight());
}
if ( nTargetWidth != aCurrObjRect.GetWidth( ) || nTargetHeight != aCurrObjRect.GetHeight( ) )
if ( (nTargetWidth != aCurrObjRect.GetWidth( ) || nTargetHeight != aCurrObjRect.GetHeight( ))
&& aCurrObjRect.GetWidth() && aCurrObjRect.GetHeight() )
{
SwDoc& rDoc = const_cast<SwDoc&>(GetPageFrame()->GetFormat()->GetDoc());