diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-05-01 20:47:09 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-02 21:10:35 +0200 |
commit | f4c8a7d47398f353f26828d049aec29e5738750d (patch) | |
tree | a30da33d70b92131b23213737be4a1acbb082766 /editeng | |
parent | 85af593eac9d40cc715f87a94d390e9e8f48b880 (diff) |
finally 'Change return value to Rectangle in next incompatible build'
Change-Id: I8d301857a2529125c6dab43e3969aa61909537b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114977
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editview.cxx | 7 | ||||
-rw-r--r-- | editeng/source/outliner/outlvw.cxx | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 5184a5cedc6f..08223368ea20 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -389,12 +389,9 @@ void EditView::SetVisArea( const tools::Rectangle& rRect ) pImpEditView->SetVisDocStartPos( rRect.TopLeft() ); } -const tools::Rectangle& EditView::GetVisArea() const +tools::Rectangle EditView::GetVisArea() const { - // Change return value to Rectangle in next incompatible build !!! - static tools::Rectangle aRect; - aRect = pImpEditView->GetVisDocArea(); - return aRect; + return pImpEditView->GetVisDocArea(); } void EditView::SetOutputArea( const tools::Rectangle& rRect ) diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 6423094e793b..da1b2f6d51ec 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -571,7 +571,7 @@ void OutlinerView::AdjustHeight( tools::Long nDY ) pEditView->MoveParagraphs( nDY ); } -tools::Rectangle const & OutlinerView::GetVisArea() const +tools::Rectangle OutlinerView::GetVisArea() const { return pEditView->GetVisArea(); } |