sw/source/uibase/lingu/hyp.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
New commits: commit ae45f22fcffdbfb8983b7f897819da1a9160fc7c Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Tue May 13 17:20:58 2025 +0200 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Wed May 14 09:42:41 2025 +0200 sw: drop macro Change-Id: I21e847ed025ac88c919e9b0eae30ec4ddb09ceda Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185265 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx index 8b3a52d6dbfd..94f9c087ad8b 100644 --- a/sw/source/uibase/lingu/hyp.cxx +++ b/sw/source/uibase/lingu/hyp.cxx @@ -31,8 +31,6 @@ #include <memory> -#define PSH (&m_rView.GetWrtShell()) - using namespace ::com::sun::star; // interactive separation @@ -65,36 +63,38 @@ void SwHyphWrapper::SpellContinue() { // for automatic separation, make actions visible only at the end std::optional<SwWait> oWait; + SwWrtShell &rSh = m_rView.GetWrtShell(); if( m_bAutomatic ) { - PSH->StartAllAction(); + rSh.StartAllAction(); oWait.emplace( *m_rView.GetDocShell(), true ); } uno::Reference< uno::XInterface > xHyphWord = m_bInSelection ? - PSH->HyphContinue( nullptr, nullptr ) : - PSH->HyphContinue( &m_nPageCount, &m_nPageStart ); + rSh.HyphContinue( nullptr, nullptr ) : + rSh.HyphContinue( &m_nPageCount, &m_nPageStart ); SetLast( xHyphWord ); // for automatic separation, make actions visible only at the end if( m_bAutomatic ) { - PSH->EndAllAction(); + rSh.EndAllAction(); oWait.reset(); } } void SwHyphWrapper::SpellEnd() { - PSH->HyphEnd(); + m_rView.GetWrtShell().HyphEnd(); SvxSpellWrapper::SpellEnd(); } bool SwHyphWrapper::SpellMore() { - PSH->Push(); + SwWrtShell &rSh = m_rView.GetWrtShell(); + rSh.Push(); m_bInfoBox = true; - PSH->Combine(); + rSh.Combine(); return false; } @@ -105,7 +105,7 @@ void SwHyphWrapper::InsertHyphen( const sal_Int32 nPos ) // insert hyphen after first char? // (instead of nPos == 0) else - PSH->HyphIgnore(); + m_rView.GetWrtShell().HyphIgnore(); } SwHyphWrapper::~SwHyphWrapper()