[Libreoffice-commits] core.git: sdext/source

Julien Nabet serval2412 at yahoo.fr
Thu Mar 28 22:51:07 PDT 2013


 sdext/source/minimizer/fileopendialog.cxx |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 1679aa60d0c06fe3b461a5d593aaeca9d8748925
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Mar 29 06:48:30 2013 +0100

    Prefer prefix ++/-- operators for non-primitive types
    
    + use const_iterator for end iterator
    
    Change-Id: I8ad8db97e35ec4fad7c02c669be981f73c9165ca

diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index 28c0ba5..3e30d21 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -122,10 +122,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext
         OUString( "com.sun.star.document.TypeDetection" ), rxContext ), UNO_QUERY_THROW );
     Sequence< OUString > aTypeList( xFilters->getElementNames() );
 
-//  mxFilePicker->setDefaultName( );
-
-    std::vector< FilterEntry >::iterator aIter( aFilterEntryList.begin() );
-    while( aIter != aFilterEntryList.end() )
+    for( std::vector< FilterEntry >::const_iterator aIter(aFilterEntryList.begin()), aEnd(aFilterEntryList.end()); aIter != aEnd; ++aIter )
     {
         Sequence< PropertyValue > aTypeProperties;
         try
@@ -152,7 +149,6 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext
         catch ( const Exception& )
         {
         }
-        aIter++;
     }
 }
 FileOpenDialog::~FileOpenDialog()
@@ -176,15 +172,13 @@ void FileOpenDialog::setDefaultName( const rtl::OUString& rDefaultName )
     rtl::OUString aFilterName;
     Reference< XFilterManager > xFilterManager( mxFilePicker, UNO_QUERY_THROW );
     rtl::OUString aUIName( xFilterManager->getCurrentFilter() );
-    std::vector< FilterEntry >::const_iterator aIter( aFilterEntryList.begin() );
-    while( aIter != aFilterEntryList.end() )
+    for( std::vector< FilterEntry >::const_iterator aIter(aFilterEntryList.begin()), aEnd(aFilterEntryList.end()); aIter != aEnd; ++aIter )
     {
         if ( aIter->maUIName == aUIName )
         {
             aFilterName = aIter->maName;
             break;
         }
-        aIter++;
     }
     return aFilterName;
 };


More information about the Libreoffice-commits mailing list