diff options
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/accessibility/accessibledialogcontrolshape.cxx | 2 | ||||
| -rw-r--r-- | basctl/source/basicide/basidesh.cxx | 13 | ||||
| -rw-r--r-- | basctl/source/basicide/bastypes.cxx | 2 |
3 files changed, 7 insertions, 10 deletions
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 05e16b6e3d17..ade2d1b2960d 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -176,7 +176,7 @@ vcl::Window* AccessibleDialogControlShape::GetWindow() const { Reference< awt::XControl > xControl( m_pDlgEdObj->GetControl(), UNO_QUERY ); if ( xControl.is() ) - pWindow = VCLUnoHelper::GetWindow( xControl->getPeer() ); + pWindow = VCLUnoHelper::GetWindow( xControl->getPeer() ).get(); } return pWindow; diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 417a987223d8..762b90b43b0a 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -309,9 +309,8 @@ void Shell::onDocumentClosed( const ScriptDocument& _rDocument ) } } // delete windows outside main loop so we don't invalidate the original iterator - for (auto it = aDeleteVec.begin(); it != aDeleteVec.end(); ++it) + for (VclPtr<BaseWindow> const & pWin : aDeleteVec) { - BaseWindow* pWin = *it; pWin->StoreData(); if ( pWin == pCurWin ) bSetCurWindow = true; @@ -436,7 +435,7 @@ void Shell::OuterResizePixel( const Point &rPos, const Size &rSize ) IMPL_LINK( Shell, TabBarHdl, ::TabBar *, pCurTabBar, void ) { sal_uInt16 nCurId = pCurTabBar->GetCurPageId(); - BaseWindow* pWin = aWindowTable[ nCurId ]; + BaseWindow* pWin = aWindowTable[ nCurId ].get(); DBG_ASSERT( pWin, "Eintrag in TabBar passt zu keinem Fenster!" ); SetCurWindow( pWin ); } @@ -555,9 +554,8 @@ void Shell::CheckWindows() if ( pWin->GetStatus() & BASWIN_TOBEKILLED ) aDeleteVec.push_back( pWin ); } - for ( auto it = aDeleteVec.begin(); it != aDeleteVec.end(); ++it ) + for ( VclPtr<BaseWindow> const & pWin : aDeleteVec ) { - BaseWindow* pWin = *it; pWin->StoreData(); if ( pWin == pCurWin ) bSetCurWindow = true; @@ -578,9 +576,8 @@ void Shell::RemoveWindows( const ScriptDocument& rDocument, const OUString& rLib if ( pWin->IsDocument( rDocument ) && pWin->GetLibName() == rLibName ) aDeleteVec.push_back( pWin ); } - for ( auto it = aDeleteVec.begin(); it != aDeleteVec.end(); ++it ) + for ( VclPtr<BaseWindow> const & pWin : aDeleteVec ) { - BaseWindow* pWin = *it; if ( pWin == pCurWin ) bChangeCurWindow = true; pWin->StoreData(); @@ -733,7 +730,7 @@ void Shell::UpdateWindows() { if ( !pNextActiveWindow ) { - pNextActiveWindow = FindApplicationWindow(); + pNextActiveWindow = FindApplicationWindow().get(); } SetCurWindow( pNextActiveWindow, true ); } diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 11f834212b5e..c186b8fe8434 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -585,7 +585,7 @@ void TabBar::Sort() sal_uInt16 nId = GetPageId( i ); aTabBarSortHelper.nPageId = nId; aTabBarSortHelper.aPageText = GetPageText( nId ); - BaseWindow* pWin = aWindowTable[ nId ]; + BaseWindow* pWin = aWindowTable[ nId ].get(); if (dynamic_cast<ModulWindow*>(pWin)) { |