core.git: 2 commits - sfx2/source sw/source

[Caolán McNamara (via logerrit)]

 sfx2/source/doc/doctempl.cxx                |    2 +-
 sw/source/filter/ww8/rtfattributeoutput.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a8727bba7d1220cfdc0e1d325ee4551d4c46e17a
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Nov 30 21:23:51 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Dec 6 21:26:06 2024 +0100

    GetRootURL is always used to ctor a INetURLObject
    
    Change-Id: Ic532e92e20bfff75b6d68c670ce21b0157034bd5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177596
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 94ab4c527338..ce2a9e5214e1 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -213,7 +213,7 @@ public:
 
     bool            GetTitleFromURL( const OUString& rURL, OUString& aTitle );
     bool            InsertRegion( std::unique_ptr<RegionData_Impl> pData, 
size_t nPos );
-    const OUString& GetRootURL() const { return maRootURL; }
+    INetURLObject   GetRootURL() const { return INetURLObject(maRootURL); }
 
     const uno::Reference< XDocumentTemplates >& getDocTemplates() const { 
return mxTemplates; }
 };
commit 5a251b6f55a950bcd71fd8ab9a9f3e1c78a73292
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Dec 6 16:57:26 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Dec 6 21:25:51 2024 +0100

    crashtesting: failure to reimport forum-it-2308.odt rtf export
    
    Change-Id: I9908dea4aa822b7793ece91874de0282239bd17b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177988
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index d2484c941825..cbb9fefb9b6f 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2547,12 +2547,12 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const 
ww8::Frame& rFrame, const Poi
                         else
                             SAL_INFO("sw.rtf", __func__ << " unhandled form 
control: '"
                                                         << 
xInfo->getImplementationName() << "'");
-                        m_aRun->append('}');
                     }
                 }
             }
 
             m_aRun->append('}');
+            m_aRun->append('}');
         }
         break;
         case ww8::Frame::eOle: