From 390e951b78288e082361c386ff5c6618d917c333 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 25 Nov 2016 16:23:17 +0200 Subject: loplugin:vclwidgets check for assigning from VclPt to T* Inspired by a recent bug report where we were assigning the result of VclPtr::Create to a raw pointer. As a consequence, we also need to change various methods that were returning newly created Window subclasses via raw pointer, to instead return those via VclPtr Change-Id: I8118e0195a5b2b4780e646cfb0e151692e54ae2b Reviewed-on: https://gerrit.libreoffice.org/31318 Reviewed-by: Noel Grandin Tested-by: Noel Grandin (cherry picked from commit e6ffb539ee232ea0c679928ff456c1cf97429f63) --- cui/source/customize/cfg.cxx | 2 +- cui/source/dialogs/hangulhanjadlg.cxx | 4 ++-- cui/source/dialogs/passwdomdlg.cxx | 4 ++-- cui/source/tabpages/chardlg.cxx | 2 +- cui/source/tabpages/swpossizetabpage.cxx | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'cui') diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 93139cae0cf3..42734d123479 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -3730,7 +3730,7 @@ void ToolbarSaveInData::SetSystemStyle( if ( xUIElement.is() ) xWindow.set( xUIElement->getRealInterface(), uno::UNO_QUERY ); - window = VCLUnoHelper::GetWindow( xWindow ); + window = VCLUnoHelper::GetWindow( xWindow ).get(); } if ( window != nullptr && window->GetType() == WINDOW_TOOLBOX ) diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 2f6c5279eb7d..b4ffdc73c751 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -851,8 +851,8 @@ namespace svx if (!_bTryBothDirections) { - CheckBox *pBox = _ePrimaryConversionDirection == HHC::eHangulToHanja? - m_pHangulOnly : m_pHanjaOnly; + CheckBox *pBox = _ePrimaryConversionDirection == HHC::eHangulToHanja ? + m_pHangulOnly.get() : m_pHanjaOnly.get(); pBox->Check(); OnConversionDirectionClicked( pBox ); } diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index 21b88d5e4c78..92866f30d842 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -115,8 +115,8 @@ IMPL_LINK_NOARG( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, Button *, void ScopedVclPtrInstance< MessageDialog > aErrorBox(m_pParent, nMismatch == 1 ? m_aOneMismatch : m_aTwoMismatch); aErrorBox->Execute(); - Edit* pEdit = !bToOpenMatch ? m_pPasswdToOpenED : m_pPasswdToModifyED; - Edit* pRepeatEdit = !bToOpenMatch? m_pReenterPasswdToOpenED : m_pReenterPasswdToModifyED; + Edit* pEdit = !bToOpenMatch ? m_pPasswdToOpenED.get() : m_pPasswdToModifyED.get(); + Edit* pRepeatEdit = !bToOpenMatch? m_pReenterPasswdToOpenED.get() : m_pReenterPasswdToModifyED.get(); if (nMismatch == 1) { pEdit->SetText( "" ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index fb2d9a5b995b..5bb00f455dc9 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -3206,7 +3206,7 @@ void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox ) void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, bool bStart ) { sal_Int32 nEntryPos = 0; - ListBox* pBox = bStart ? m_pStartBracketLB : m_pEndBracketLB; + ListBox* pBox = bStart ? m_pStartBracketLB.get() : m_pEndBracketLB.get(); if ( 0 == cBracket ) pBox->SelectEntryPos(0); else diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 43d95f5b129d..37324f46c139 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1286,8 +1286,8 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox&, rLB, void ) IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void ) { bool bHori = &rLB == m_pHoriLB; - ListBox *pRelLB = bHori ? m_pHoriToLB : m_pVertToLB; - FixedText *pRelFT = bHori ? m_pHoriToFT : m_pVertToFT; + ListBox *pRelLB = bHori ? m_pHoriToLB.get() : m_pVertToLB.get(); + FixedText *pRelFT = bHori ? m_pHoriToFT.get() : m_pVertToFT.get(); FrmMap *pMap = bHori ? m_pHMap : m_pVMap; -- cgit v1.2.3