compilerplugins/clang/fieldcast.results | 3 --- sw/source/uibase/dochdl/swdtflvr.cxx | 6 +----- sw/source/uibase/inc/swdtflvr.hxx | 4 +++- 3 files changed, 4 insertions(+), 9 deletions(-)
New commits: commit 68a2e50726e2f16354ff45d6768790e076989cb6 Author: Noel Grandin <[email protected]> AuthorDate: Wed Nov 22 11:41:26 2023 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Nov 22 18:38:45 2023 +0100 loplugin:fieldcast in SwTransferable Change-Id: I8e9f157a399f1b305d2e6b6e63da837f0090fd8b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159814 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/compilerplugins/clang/fieldcast.results b/compilerplugins/clang/fieldcast.results index e65cc5123250..0bdabb345340 100644 --- a/compilerplugins/clang/fieldcast.results +++ b/compilerplugins/clang/fieldcast.results @@ -565,9 +565,6 @@ sw/source/ui/dialog/swdlgfact.hxx:562 sw/source/uibase/inc/fldmgr.hxx:103 SwFieldMgr m_pCurField SwField * SwPageNumberField -sw/source/uibase/inc/swdtflvr.hxx:81 - SwTransferable m_xDdeLink tools::SvRef<sfx2::SvBaseLink> - (anonymous namespace)::SwTransferDdeLink sw/source/uibase/inc/swuiccoll.hxx:35 SwCondCollPage m_pFormat SwFormat * SwConditionTextFormatColl diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 91eb38e0f45c..cb96c08527c6 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -173,8 +173,6 @@ void collectUIInformation(const OUString& rAction, const OUString& aParameters) } -namespace { - class SwTransferDdeLink : public ::sfx2::SvBaseLink { OUString m_sName; @@ -204,8 +202,6 @@ public: void Disconnect( bool bRemoveDataAdvise ); }; -} - /// Tracks the boundaries of pasted content and notifies listeners. class SwPasteContext { @@ -393,7 +389,7 @@ void SwTransferable::DisconnectDDE() { if( m_xDdeLink.is() ) { - static_cast<SwTransferDdeLink*>( m_xDdeLink.get() )->Disconnect( true ); + m_xDdeLink->Disconnect( true ); m_xDdeLink.clear(); } } diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx index e7e1849a0dc9..6234bd37294b 100644 --- a/sw/source/uibase/inc/swdtflvr.hxx +++ b/sw/source/uibase/inc/swdtflvr.hxx @@ -73,12 +73,14 @@ enum class PasteTableType PASTE_TABLE // paste table as nested table }; +class SwTransferDdeLink; + class SW_DLLPUBLIC SwTransferable final : public TransferableHelper { friend class SwView_Impl; SfxObjectShellLock m_aDocShellRef; TransferableObjectDescriptor m_aObjDesc; - tools::SvRef<sfx2::SvBaseLink> m_xDdeLink; + tools::SvRef<SwTransferDdeLink> m_xDdeLink; SwWrtShell *m_pWrtShell; /* #96392# Added pCreatorView to distinguish SwFrameShell from
