ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

loplugin:useuniqueptr in StdTabController::autoTabOrder

Browse Source 
Change-Id: I67c2283974eb71978beaf265f821fd2c5c5ae55c
Reviewed-on: https://gerrit.libreoffice.org/60626
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-09-18 09:08:35 +02:00
parent b225295d68
commit 1d6366fc9a
2 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/toolkit/controls/stdtabcontrollermodel.hxx
-8
View File
@@ -69,14 +69,6 @@ struct UnoControlModelEntry
};
};
struct ComponentEntry
{
css::awt::XWindow* pComponent;
Point aPos;
};
typedef ::std::vector< ComponentEntry* > ComponentEntryList;
#define CONTROLPOS_NOTFOUND 0xFFFFFFFF
class StdTabControllerModel final : public css::awt::XTabControllerModel,
toolkit/source/controls/stdtabcontroller.cxx
+22 -20
View File
@@ -231,6 +231,12 @@ Sequence< Reference< XControl > > StdTabController::getControls( )
return aSeq;
}
struct ComponentEntry
{
css::awt::XWindow* pComponent;
::Point aPos;
};
void StdTabController::autoTabOrder( )
{
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -255,43 +261,39 @@ void StdTabController::autoTabOrder( )
Reference< XWindow > * pComponents = aCompSeq.getArray();
// insert sort algorithm
ComponentEntryList aCtrls;
size_t n;
for ( n = 0; n < nCtrls; n++ )
std::vector< ComponentEntry > aCtrls;
aCtrls.reserve(nCtrls);
for ( size_t n = 0; n < nCtrls; n++ )
{
XWindow* pC = pComponents[n].get();
ComponentEntry* pE = new ComponentEntry;
pE->pComponent = pC;
ComponentEntry newEntry;
newEntry.pComponent = pC;
awt::Rectangle aPosSize = pC->getPosSize();
pE->aPos.setX( aPosSize.X );
pE->aPos.setY( aPosSize.Y );
newEntry.aPos.setX( aPosSize.X );
newEntry.aPos.setY( aPosSize.Y );
ComponentEntryList::size_type nPos;
decltype(aCtrls)::size_type nPos;
for ( nPos = 0; nPos < aCtrls.size(); nPos++ )
{
ComponentEntry* pEntry = aCtrls[ nPos ];
if ( ( pEntry->aPos.Y() > pE->aPos.Y() ) ||
( ( pEntry->aPos.Y() == pE->aPos.Y() ) && ( pEntry->aPos.X() > pE->aPos.X() ) ) )
ComponentEntry& rEntry = aCtrls[ nPos ];
if ( ( rEntry.aPos.Y() > newEntry.aPos.Y() ) ||
( ( rEntry.aPos.Y() == newEntry.aPos.Y() ) && ( rEntry.aPos.X() > newEntry.aPos.X() ) ) )
break;
}
if ( nPos < aCtrls.size() ) {
ComponentEntryList::iterator it = aCtrls.begin();
::std::advance( it, nPos );
aCtrls.insert( it, pE );
aCtrls.insert( aCtrls.begin() + nPos, newEntry );
} else {
aCtrls.push_back( pE );
aCtrls.push_back( newEntry );
}
}
Sequence< Reference< XControlModel > > aNewSeq( nCtrls );
for ( n = 0; n < nCtrls; n++ )
for ( size_t n = 0; n < nCtrls; n++ )
{
ComponentEntry* pE = aCtrls[ n ];
Reference< XControl > xUC( pE->pComponent, UNO_QUERY );
ComponentEntry& rEntry = aCtrls[ n ];
Reference< XControl > xUC( rEntry.pComponent, UNO_QUERY );
aNewSeq.getArray()[n] = xUC->getModel();
delete pE;
}
aCtrls.clear();
mxModel->setControlModels( aNewSeq );
}