diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-20 08:43:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-20 12:11:11 +0200 |
| commit | 1553d3787cbe0cdababf31382bf3376a3640d8cf (patch) | |
| tree | b829cc1f97dac33abdf1e592a636d6fb24497f13 /dtrans | |
| parent | c2ead5a142be19cb74127294641ec35da9e0f5c5 (diff) | |
use for-range on Sequence in d*
and fix bug in GenericClipboard::initialize, where it was looping through
the arguments, but always reading the first one.
I'm guessing it was never an issue because it is always called with
only one argument
Change-Id: I8f72b6bce8c77a69c7d75115e34630e2c308261e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94553
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dtrans')
| -rw-r--r-- | dtrans/source/generic/generic_clipboard.cxx | 6 | ||||
| -rw-r--r-- | dtrans/source/win32/dtobj/DOTransferable.cxx | 4 | ||||
| -rw-r--r-- | dtrans/test/win32/dnd/dndTest.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx index 4fa49b3d5ebe..4f358db37336 100644 --- a/dtrans/source/generic/generic_clipboard.cxx +++ b/dtrans/source/generic/generic_clipboard.cxx @@ -45,10 +45,10 @@ void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments ) { if (!m_bInitialized) { - for (sal_Int32 n = 0, nmax = aArguments.getLength(); n < nmax; n++) - if (aArguments[n].getValueType() == cppu::UnoType<OUString>::get()) + for (Any const & arg : aArguments) + if (arg.getValueType() == cppu::UnoType<OUString>::get()) { - aArguments[0] >>= m_aName; + arg >>= m_aName; break; } } diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx index f90406462c81..8f27e7124e0a 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.cxx +++ b/dtrans/source/win32/dtobj/DOTransferable.cxx @@ -294,8 +294,8 @@ sal_Bool SAL_CALL CDOTransferable::isDataFlavorSupported( const DataFlavor& aFla { OSL_ASSERT( isValidFlavor( aFlavor ) ); - for ( sal_Int32 i = 0; i < m_FlavorList.getLength( ); i++ ) - if ( compareDataFlavors( aFlavor, m_FlavorList[i] ) ) + for ( DataFlavor const & df : std::as_const(m_FlavorList) ) + if ( compareDataFlavors( aFlavor, df ) ) return true; return false; diff --git a/dtrans/test/win32/dnd/dndTest.cxx b/dtrans/test/win32/dnd/dndTest.cxx index b9f1d841e1c5..3a022d98758d 100644 --- a/dtrans/test/win32/dnd/dndTest.cxx +++ b/dtrans/test/win32/dnd/dndTest.cxx @@ -149,7 +149,7 @@ DWORD WINAPI MTAFunc( void* threadData) StartDragData* pData= (StartDragData*)msg.wParam; Sequence<DataFlavor> seq= pData->transferable->getTransferDataFlavors(); // have a look what flavours are supported - for( int i=0; i<seq.getLength(); i++) + for( int i=0; i<seq.(); i++) { DataFlavor d= seq[i]; } |