diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-18 10:40:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-19 10:44:06 +0000 |
| commit | 4dac12efdce4f5cd83fd78a901186c68f020b7fa (patch) | |
| tree | 464a34ffd51e096ff06d6f16c2364302229da049 /sw/source/filter | |
| parent | c6668bf7f87bb50ee5d795f17a67666018931b9a (diff) | |
XUnoTunnel->dynamic_cast for SwXFrame
Change-Id: I48fd10781e7f09b37b6b0000f68456e8194e6d7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145761
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/xml/xmlexp.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmltexte.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmltexti.cxx | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 8edb4f520785..ff8cc2ed2c49 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -520,9 +520,7 @@ SwDoc* SwXMLExport::getDoc() } Reference < XText > xText = xTextDoc->getText(); - Reference<XUnoTunnel> xTextTunnel( xText, UNO_QUERY); - assert( xTextTunnel.is()); - SwXText* pText = comphelper::getFromUnoTunnel<SwXText>(xTextTunnel); + SwXText* pText = dynamic_cast<SwXText*>(xText.get()); assert( pText != nullptr ); m_pDoc = pText->GetDoc(); assert( m_pDoc != nullptr ); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 9233886fe0b8..44c890eb3df8 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1656,9 +1656,7 @@ SwDoc* SwXMLImport::getDoc() return m_pDoc; Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY ); Reference < XText > xText = xTextDoc->getText(); - Reference<XUnoTunnel> xTextTunnel( xText, UNO_QUERY); - assert( xTextTunnel.is()); - SwXText* pText = comphelper::getFromUnoTunnel<SwXText>(xTextTunnel); + SwXText* pText = dynamic_cast<SwXText*>(xText.get()); assert( pText != nullptr ); m_pDoc = pText->GetDoc(); assert( m_pDoc != nullptr ); diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 2fd9e9c40376..3161d416797c 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -68,9 +68,7 @@ enum SvEmbeddedObjectTypes SwNoTextNode *SwXMLTextParagraphExport::GetNoTextNode( const Reference < XPropertySet >& rPropSet ) { - Reference<XUnoTunnel> xCursorTunnel( rPropSet, UNO_QUERY ); - assert(xCursorTunnel.is() && "missing XUnoTunnel for embedded"); - SwXFrame* pFrame = comphelper::getFromUnoTunnel<SwXFrame>(xCursorTunnel); + SwXFrame* pFrame = dynamic_cast<SwXFrame*>(rPropSet.get()); assert(pFrame && "SwXFrame missing"); SwFrameFormat *pFrameFormat = pFrame->GetFrameFormat(); const SwFormatContent& rContent = pFrameFormat->GetContent(); diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 0464c0f26a83..f64fceeaea1f 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -872,9 +872,7 @@ void SwXMLTextImportHelper::endAppletOrPlugin( // this method will modify the document directly -> lock SolarMutex SolarMutexGuard aGuard; - uno::Reference<XUnoTunnel> xCursorTunnel( rPropSet, UNO_QUERY ); - assert(xCursorTunnel.is() && "missing XUnoTunnel for embedded"); - SwXFrame* pFrame = comphelper::getFromUnoTunnel<SwXFrame>(xCursorTunnel); + SwXFrame* pFrame = dynamic_cast<SwXFrame*>(rPropSet.get()); OSL_ENSURE( pFrame, "SwXFrame missing" ); SwFrameFormat *pFrameFormat = pFrame->GetFrameFormat(); const SwFormatContent& rContent = pFrameFormat->GetContent(); |