[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/source

[Mike Kaganski (via logerrit)]

 sw/source/core/inc/unoflatpara.hxx     |    3 ---
 sw/source/core/unocore/unoflatpara.cxx |    6 ------
 2 files changed, 9 deletions(-)

New commits:
commit 193c0f20fc1f8f836ebdabac0d8a1065162653a7
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri May 12 23:05:33 2023 +0300
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon May 15 11:01:51 2023 +0200

    tdf#155232: drop m_aFlatParaList from SwXFlatParagraphIterator
    
    There is no need to keep those references. The set was there from
    the beginning, introduced in commits 
677eba2322d2753951024c688d59553182bf2fbd
    (INTEGRATION: CWS gcframework_DEV300 (1.1.2); FILE ADDED, 2008-02-26) and
    ba76230f6f677774b0d333da946a7e487acbeb0b (INTEGRATION: CWS 
gcframework_DEV300
    (1.1.2); FILE ADDED, 2008-02-26).
    
    Change-Id: Iaf2482adb0aac063ad106c4198baf74577a75bf4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151712
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    (cherry picked from commit a7ce722b476c4bb0c9a113ae0c2759181edfe48f)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151771
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/source/core/inc/unoflatpara.hxx 
b/sw/source/core/inc/unoflatpara.hxx
index 6523609a6a5c..2cc2c354c292 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -131,9 +131,6 @@ private:
     SwXFlatParagraphIterator( const SwXFlatParagraphIterator & ) = delete;
     SwXFlatParagraphIterator & operator =(const SwXFlatParagraphIterator & ) = 
delete;
 
-    // container to hold the 'hard' references as long as necessary and valid
-    std::set< css::uno::Reference< css::text::XFlatParagraph > >    
m_aFlatParaList;
-
     SwDoc* mpDoc;
     const sal_Int32 mnType;
     const bool mbAutomatic;
diff --git a/sw/source/core/unocore/unoflatpara.cxx 
b/sw/source/core/unocore/unoflatpara.cxx
index 3182812cecdb..d5f3c9c4130b 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -481,8 +481,6 @@ uno::Reference< text::XFlatParagraph > 
SwXFlatParagraphIterator::getNextPara()
         const OUString& aExpandText = aConversionMap.getViewText();
 
         xRet = new SwXFlatParagraph( *pRet, aExpandText, aConversionMap );
-        // keep hard references...
-        m_aFlatParaList.insert( xRet );
     }
 
     return xRet;
@@ -531,8 +529,6 @@ uno::Reference< text::XFlatParagraph > 
SwXFlatParagraphIterator::getParaAfter(co
         const OUString& aExpandText = aConversionMap.getViewText();
 
         xRet = new SwXFlatParagraph( *pNextTextNode, aExpandText, 
aConversionMap );
-        // keep hard references...
-        m_aFlatParaList.insert( xRet );
     }
 
     return xRet;
@@ -577,8 +573,6 @@ uno::Reference< text::XFlatParagraph > 
SwXFlatParagraphIterator::getParaBefore(c
         const OUString& aExpandText = aConversionMap.getViewText();
 
         xRet = new SwXFlatParagraph( *pPrevTextNode, aExpandText, 
aConversionMap );
-        // keep hard references...
-        m_aFlatParaList.insert( xRet );
     }
 
     return xRet;