summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls/tbunosearchcontrollers.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-11-10 12:53:02 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-11-11 06:55:41 +0000
commit78b4a1fb01af9ad3b3395a22f6e396be914b553e (patch)
tree846fdaea907a70fdc274a1e76642ed5e06622c0d /svx/source/tbxctrls/tbunosearchcontrollers.cxx
parent071e23fee07b92b8f07800cda3ca7e66afe818ae (diff)
update vclwidget loplugin to find ref-dropping assigment
Look for places where we are accidentally assigning a returned-by-value VclPtr<T> to a T*, which generally ends up in a use-after-free. Change-Id: I4f361eaca88820cdb7aa3b8340212db61580fdd9 Reviewed-on: https://gerrit.libreoffice.org/30749 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/tbxctrls/tbunosearchcontrollers.cxx')
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.cxx32
1 files changed, 16 insertions, 16 deletions
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 9628b8b952e6..b411c6cf18b2 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -430,8 +430,8 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< c
{
svt::ToolboxController::initialize(aArguments);
- vcl::Window* pWindow = VCLUnoHelper::GetWindow( getParent() );
- ToolBox* pToolBox = static_cast<ToolBox*>(pWindow);
+ VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( getParent() );
+ ToolBox* pToolBox = static_cast<ToolBox*>(pWindow.get());
if ( pToolBox )
{
sal_uInt16 nItemCount = pToolBox->GetItemCount();
@@ -452,10 +452,10 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL FindTextToolbarController::cre
{
css::uno::Reference< css::awt::XWindow > xItemWindow;
- vcl::Window* pParent = VCLUnoHelper::GetWindow( xParent );
+ VclPtr<vcl::Window> pParent = VCLUnoHelper::GetWindow( xParent );
if ( pParent )
{
- ToolBox* pToolbar = static_cast<ToolBox*>(pParent);
+ ToolBox* pToolbar = static_cast<ToolBox*>(pParent.get());
m_pFindTextFieldControl = VclPtr<FindTextFieldControl>::Create( pToolbar, WinBits( WB_DROPDOWN | WB_VSCROLL), m_xFrame, m_xContext );
Size aSize(250, m_pFindTextFieldControl->GetTextHeight() + 200);
@@ -491,8 +491,8 @@ IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl, Edit&, void)
void FindTextToolbarController::textfieldChanged() {
// enable or disable item DownSearch/UpSearch of findbar
- vcl::Window* pWindow = VCLUnoHelper::GetWindow( getParent() );
- ToolBox* pToolBox = static_cast<ToolBox*>(pWindow);
+ VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( getParent() );
+ ToolBox* pToolBox = static_cast<ToolBox*>(pWindow.get());
if ( pToolBox && m_pFindTextFieldControl )
{
bool enableButtons = !m_pFindTextFieldControl->GetText().isEmpty();
@@ -575,8 +575,8 @@ void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/
if ( m_bDisposed )
throw css::lang::DisposedException();
- vcl::Window* pWindow = VCLUnoHelper::GetWindow( getParent() );
- ToolBox* pToolBox = static_cast<ToolBox*>(pWindow);
+ VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( getParent() );
+ ToolBox* pToolBox = static_cast<ToolBox*>(pWindow.get());
impl_executeSearch(m_xContext, m_xFrame, pToolBox, meType == UP );
@@ -665,10 +665,10 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL MatchCaseToolboxController::cr
{
css::uno::Reference< css::awt::XWindow > xItemWindow;
- vcl::Window* pParent = VCLUnoHelper::GetWindow( xParent );
+ VclPtr<vcl::Window> pParent = VCLUnoHelper::GetWindow( xParent );
if ( pParent )
{
- ToolBox* pToolbar = static_cast<ToolBox*>(pParent);
+ ToolBox* pToolbar = static_cast<ToolBox*>(pParent.get());
m_pMatchCaseControl = VclPtr<CheckBox>::Create( pToolbar, 0 );
m_pMatchCaseControl->SetText( SVX_RESSTR( RID_SVXSTR_FINDBAR_MATCHCASE ) );
Size aSize( m_pMatchCaseControl->GetOptimalSize() );
@@ -757,10 +757,10 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL SearchFormattedToolboxControll
{
css::uno::Reference< css::awt::XWindow > xItemWindow;
- vcl::Window* pParent = VCLUnoHelper::GetWindow( xParent );
+ VclPtr<vcl::Window> pParent = VCLUnoHelper::GetWindow( xParent );
if ( pParent )
{
- ToolBox* pToolbar = static_cast<ToolBox*>(pParent);
+ ToolBox* pToolbar = static_cast<ToolBox*>(pParent.get());
m_pSearchFormattedControl = VclPtr<CheckBox>::Create( pToolbar, 0 );
m_pSearchFormattedControl->SetText( SVX_RESSTR( RID_SVXSTR_FINDBAR_SEARCHFORMATTED ) );
Size aSize( m_pSearchFormattedControl->GetOptimalSize() );
@@ -848,8 +848,8 @@ void SAL_CALL FindAllToolboxController::execute( sal_Int16 /*KeyModifier*/ ) thr
if ( m_bDisposed )
throw css::lang::DisposedException();
- vcl::Window* pWindow = VCLUnoHelper::GetWindow( getParent() );
- ToolBox* pToolBox = static_cast<ToolBox*>(pWindow);
+ VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( getParent() );
+ ToolBox* pToolBox = static_cast<ToolBox*>(pWindow.get());
impl_executeSearch(m_xContext, m_xFrame, pToolBox, false, true);
}
@@ -1142,8 +1142,8 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css
}
css::uno::Reference< css::awt::XWindow > xWindow(xUIElement->getRealInterface(), css::uno::UNO_QUERY);
- vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
- ToolBox* pToolBox = static_cast<ToolBox*>(pWindow);
+ VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xWindow );
+ ToolBox* pToolBox = static_cast<ToolBox*>(pWindow.get());
if ( pToolBox )
{
sal_uInt16 nItemCount = pToolBox->GetItemCount();