core.git: 2 commits - sc/source

[Mike Kaganski (via logerrit)]

 sc/source/filter/xml/xmlexprt.cxx |   31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 211389c2d35188adc6f4e110378dd526746b6e8a
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Nov 28 10:33:37 2024 +0500
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Nov 28 09:14:10 2024 +0100

    Flatten
    
    Change-Id: I68a38cd7b2bf2dd966b357d81b6831790a229392
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177457
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Tested-by: Jenkins

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 0965e2482d5a..0bb49fcd738d 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -678,26 +678,27 @@ table::CellRangeAddress ScXMLExport::GetEndAddress(const 
uno::Reference<sheet::X
 
 void ScXMLExport::GetAreaLinks( ScMyAreaLinksContainer& rAreaLinks )
 {
-    if (mpDoc && mpDoc->GetLinkManager())
+    if (!mpDoc)
+        return;
+    sfx2::LinkManager* pManager = mpDoc->GetLinkManager();
+    if (!pManager)
+        return;
+
+    for (const auto& rLink : pManager->GetLinks())
     {
-        const sfx2::SvBaseLinks& rLinks = mpDoc->GetLinkManager()->GetLinks();
-        for (const auto & rLink : rLinks)
+        if (ScAreaLink* pLink = dynamic_cast<ScAreaLink*>(rLink.get()))
         {
-            ScAreaLink *pLink = dynamic_cast<ScAreaLink*>(rLink.get());
-            if (pLink)
-            {
-                ScMyAreaLink aAreaLink;
-                aAreaLink.aDestRange = pLink->GetDestArea();
-                aAreaLink.sSourceStr = pLink->GetSource();
-                aAreaLink.sFilter = pLink->GetFilter();
-                aAreaLink.sFilterOptions = pLink->GetOptions();
-                aAreaLink.sURL = pLink->GetFile();
-                aAreaLink.nRefreshDelaySeconds = 
pLink->GetRefreshDelaySeconds();
-                rAreaLinks.AddNewAreaLink( aAreaLink );
-            }
+            ScMyAreaLink aAreaLink;
+            aAreaLink.aDestRange = pLink->GetDestArea();
+            aAreaLink.sSourceStr = pLink->GetSource();
+            aAreaLink.sFilter = pLink->GetFilter();
+            aAreaLink.sFilterOptions = pLink->GetOptions();
+            aAreaLink.sURL = pLink->GetFile();
+            aAreaLink.nRefreshDelaySeconds = pLink->GetRefreshDelaySeconds();
+            rAreaLinks.AddNewAreaLink( aAreaLink );
         }
-        rAreaLinks.Sort();
     }
+    rAreaLinks.Sort();
 }
 
 // core implementation
commit 8bb3778952ca5adf641f0382e4279ad55594b424
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Nov 28 10:16:42 2024 +0500
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Nov 28 09:14:03 2024 +0100

    Only sort if had a chance to add something
    
    Change-Id: I54ec1368ab64d422de13217e877076a3ee41de94
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177456
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Tested-by: Jenkins

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 2a5610483cc3..0965e2482d5a 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -696,8 +696,8 @@ void ScXMLExport::GetAreaLinks( ScMyAreaLinksContainer& 
rAreaLinks )
                 rAreaLinks.AddNewAreaLink( aAreaLink );
             }
         }
+        rAreaLinks.Sort();
     }
-    rAreaLinks.Sort();
 }
 
 // core implementation