[Libreoffice-commits] core.git: 2 commits - sw/source

[Noel Grandin (via logerrit)]

 sw/source/core/text/porlay.cxx         |    4 ++--
 sw/source/core/unocore/unoportenum.cxx |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 301e522e7ee440b9c026042dd94815134c88adf2
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun Sep 17 19:35:36 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Sep 18 15:31:10 2023 +0200

    use more concrete UNO types in sw
    
    Change-Id: I9eadb749cf8971a9753227e848e72903d06b11ca
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157012
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 5208d6ab0320..0c247cbc8dc1 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -909,9 +909,9 @@ static Color getBookmarkColor(const SwTextNode& rNode, 
const sw::mark::IBookmark
     try
     {
         SwDoc& rDoc = const_cast<SwDoc&>(rNode.GetDoc());
-        const uno::Reference< text::XTextContent > xRef = 
SwXBookmark::CreateXBookmark(rDoc,
+        const rtl::Reference< SwXBookmark > xRef = 
SwXBookmark::CreateXBookmark(rDoc,
                 const_cast<sw::mark::IMark*>(static_cast<const 
sw::mark::IMark*>(pBookmark)));
-        const css::uno::Reference<css::rdf::XResource> xSubject(xRef, 
uno::UNO_QUERY);
+        const css::uno::Reference<css::rdf::XResource> xSubject(xRef);
         uno::Reference<frame::XModel> xModel = 
rDoc.GetDocShell()->GetBaseModel();
 
         static uno::Reference< uno::XComponentContext > xContext(
commit 34d6dfb68224f576fb316a0822143470233fd40a
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun Sep 17 19:33:31 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Sep 18 15:31:00 2023 +0200

    use more concrete UNO types in sw
    
    Change-Id: Ia6e3c30267a80726793edfccb891970d706d913f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157011
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/source/core/unocore/unoportenum.cxx 
b/sw/source/core/unocore/unoportenum.cxx
index 791622ea875b..4b50a72cf5ad 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -543,7 +543,7 @@ lcl_CreateContentControlPortion(const 
css::uno::Reference<SwXText>& xParent,
                                 const SwUnoCursor* pUnoCursor, SwTextAttr& 
rAttr,
                                 std::unique_ptr<const TextRangeList_t>&& 
pPortions)
 {
-    uno::Reference<text::XTextContent> xContentControl = 
SwXContentControl::CreateXContentControl(
+    rtl::Reference<SwXContentControl> xContentControl = 
SwXContentControl::CreateXContentControl(
         
*static_cast<SwFormatContentControl&>(rAttr.GetAttr()).GetContentControl(), 
xParent,
         std::move(pPortions));
     rtl::Reference<SwXTextPortion> pPortion;
@@ -995,7 +995,7 @@ lcl_ExportHints(
                         if (*pUnoCursor->GetMark() == *pUnoCursor->GetPoint())
                             break;
                         pPortion = new SwXTextPortion(pUnoCursor, xParent, 
PORTION_LINEBREAK);
-                        uno::Reference<text::XTextContent> xLineBreak
+                        rtl::Reference<SwXLineBreak> xLineBreak
                             = SwXLineBreak::CreateXLineBreak(
                                 
&const_cast<SwFormatLineBreak&>(pAttr->GetLineBreak()));
                         pPortion->SetLineBreak(xLineBreak);