core.git: sw/source

[Mike Kaganski (via logerrit)]

 sw/source/filter/basflt/fltini.cxx |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit a3415dcf310b9dc7de5b193ff2c020fceb45a0e9
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Apr 11 16:29:50 2025 +0500
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Apr 11 14:44:22 2025 +0200

    Simplify SwReaderWriterEntry::GetReader/GetWriter a bit
    
    Change-Id: Ie356bc3a6ffc94834e27e15935b3a9b53b8be410
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184036
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Tested-by: Jenkins

diff --git a/sw/source/filter/basflt/fltini.cxx 
b/sw/source/filter/basflt/fltini.cxx
index 744ec4a1379d..260a88134d24 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -68,22 +68,17 @@ static SwReaderWriterEntry aReaderWriter[] =
 
 Reader* SwReaderWriterEntry::GetReader()
 {
-    if ( pReader )
-        return pReader;
-    else if ( fnGetReader )
-    {
-        pReader = (*fnGetReader)();
-        return pReader;
-    }
-    return nullptr;
+    if (!pReader && fnGetReader)
+        pReader = fnGetReader();
+    return pReader;
 }
 
 void SwReaderWriterEntry::GetWriter( std::u16string_view rNm, const OUString& 
rBaseURL, WriterRef& xWrt ) const
 {
     if ( fnGetWriter )
-        (*fnGetWriter)( rNm, rBaseURL, xWrt );
+        fnGetWriter(rNm, rBaseURL, xWrt);
     else
-        xWrt = WriterRef(nullptr);
+        xWrt.clear();
 }
 
 Reader* SwGetReaderXML() // SW_DLLPUBLIC