[Libreoffice-commits] core.git: editeng/source include/editeng

[Caolán McNamara (via logerrit)]

 editeng/source/editeng/editview.cxx |    7 ++-----
 editeng/source/outliner/outlvw.cxx  |    2 +-
 include/editeng/editview.hxx        |    2 +-
 include/editeng/outliner.hxx        |    2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit f4c8a7d47398f353f26828d049aec29e5738750d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat May 1 20:47:09 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun May 2 21:10:35 2021 +0200

    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 at redhat.com>

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();
 }
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 41cf529a81a2..cbc65bf93e1c 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -218,7 +218,7 @@ public:
                         // Document position.
                         // A size change also affects the VisArea
     void                SetVisArea( const tools::Rectangle& rRect );
-    const tools::Rectangle&    GetVisArea() const;
+    tools::Rectangle    GetVisArea() const;
 
     PointerStyle    GetPointer() const;
 
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 86cca91d9db9..411ab2d891cb 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -231,7 +231,7 @@ public:
     void        SetOutputArea( const tools::Rectangle& rRect );
     tools::Rectangle const & GetOutputArea() const;
 
-    tools::Rectangle const & GetVisArea() const;
+    tools::Rectangle GetVisArea() const;
 
     void        CreateSelectionList (std::vector<Paragraph*> &aSelList) ;