summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-05-25 19:25:53 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-05-26 08:42:07 +0200
commit399149155cf4f882541848ea53bfa5c9806b23f8 (patch)
tree7d4beaebdff4d0c725fda27662009c2b2f7b0fe1 /sw/source/uibase
parent581f12c0bdfb718379c16bef01d71ee9e45a5b5a (diff)
make SwRect(Rectangle) constructor explicit
Change-Id: I715aa9499598c483ccf907f829c9ba3540edf216 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116120 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx2
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx2
-rw-r--r--sw/source/uibase/lingu/sdrhhcwrap.cxx2
-rw-r--r--sw/source/uibase/ribbar/drawbase.cxx2
-rw-r--r--sw/source/uibase/shells/textsh1.cxx4
-rw-r--r--sw/source/uibase/uiview/viewdraw.cxx2
-rw-r--r--sw/source/uibase/uiview/viewport.cxx2
7 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index 38ad0d75b5a7..c5a0f8edca30 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -778,7 +778,7 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh)
if(pCurrentTextObj)
pDrView->SdrEndTextEdit( true );
// and the found one should be activated
- rSh.MakeVisible(pTextObj->GetLogicRect());
+ rSh.MakeVisible(SwRect(pTextObj->GetLogicRect()));
Point aTmp( 0,0 );
rSh.SelectObj( aTmp, 0, pTextObj );
SdrPageView* pPV = pDrView->GetSdrPageView();
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index ec09f3c07f12..446d2faa5405 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -4781,7 +4781,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
ICheckboxFieldmark& rCheckboxFm = dynamic_cast<ICheckboxFieldmark&>(*fieldBM);
rCheckboxFm.SetChecked(!rCheckboxFm.IsChecked());
rCheckboxFm.Invalidate();
- rSh.InvalidateWindows( m_rView.GetVisArea() );
+ rSh.InvalidateWindows( SwRect(m_rView.GetVisArea()) );
}
}
}
diff --git a/sw/source/uibase/lingu/sdrhhcwrap.cxx b/sw/source/uibase/lingu/sdrhhcwrap.cxx
index a626be95da3e..939890805425 100644
--- a/sw/source/uibase/lingu/sdrhhcwrap.cxx
+++ b/sw/source/uibase/lingu/sdrhhcwrap.cxx
@@ -142,7 +142,7 @@ bool SdrHHCWrapper::ConvertNextDocument()
pOutlView->SetOutputArea( tools::Rectangle( Point(), Size(1,1)));
SetPaperSize( pTextObj->GetLogicRect().GetSize() );
SetUpdateMode(true);
- pView->GetWrtShell().MakeVisible(pTextObj->GetLogicRect());
+ pView->GetWrtShell().MakeVisible(SwRect(pTextObj->GetLogicRect()));
pSdrView->SdrBeginTextEdit(pTextObj, pPV, &pView->GetEditWin(), false, this, pOutlView.get(), true, true);
}
diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx
index c35563f167dc..e3f6e07538c6 100644
--- a/sw/source/uibase/ribbar/drawbase.cxx
+++ b/sw/source/uibase/ribbar/drawbase.cxx
@@ -528,7 +528,7 @@ Point SwDrawBase::GetDefaultCenterPos() const
SwRect aVisArea(m_pSh->VisArea());
if (comphelper::LibreOfficeKit::isActive())
{
- aVisArea = m_pSh->getLOKVisibleArea();
+ aVisArea = SwRect(m_pSh->getLOKVisibleArea());
aVisArea.Intersection(SwRect(Point(), aDocSz));
}
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 010c8551c810..0c11a9395a40 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1430,7 +1430,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
if (pDlg->Execute() == RET_OK)
{
pFieldBM->Invalidate();
- rWrtSh.InvalidateWindows( rWrtSh.GetView().GetVisArea() );
+ rWrtSh.InvalidateWindows( SwRect(rWrtSh.GetView().GetVisArea()) );
rWrtSh.UpdateCursor(); // cursor position might be invalid
}
}
@@ -1442,7 +1442,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
if (pDlg->Execute() == RET_OK)
{
rDateField.Invalidate();
- rWrtSh.InvalidateWindows( rWrtSh.GetView().GetVisArea() );
+ rWrtSh.InvalidateWindows( SwRect(rWrtSh.GetView().GetVisArea()) );
rWrtSh.UpdateCursor(); // cursor position might be invalid
}
}
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index b676999f6448..9d6d07e1deaf 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -161,7 +161,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
{
Size aDocSize( m_pWrtShell->GetDocSize() );
const SwRect& rVisArea = comphelper::LibreOfficeKit::isActive() ?
- m_pWrtShell->getLOKVisibleArea() : m_pWrtShell->VisArea();
+ SwRect(m_pWrtShell->getLOKVisibleArea()) : m_pWrtShell->VisArea();
Point aPos( rVisArea.Center() );
tools::Rectangle aObjRect( pObj->GetLogicRect() );
diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx
index eaaa780cf02c..c7b6a48a4179 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -246,7 +246,7 @@ void SwView::SetVisArea( const tools::Rectangle &rRect, bool bUpdateScrollbar )
if ( m_pWrtShell )
{
- m_pWrtShell->VisPortChgd( m_aVisArea );
+ m_pWrtShell->VisPortChgd( SwRect(m_aVisArea) );
if ( aOldSz != m_pWrtShell->VisArea().SSize() &&
( std::abs(aOldSz.Width() - m_pWrtShell->VisArea().Width()) > 2 ||
std::abs(aOldSz.Height() - m_pWrtShell->VisArea().Height()) > 2 ) )