3 files changed, 11 insertions, 16 deletions
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index b8787f4cedac..8e8b7aaa559f 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -440,16 +440,13 @@ namespace xmloff
     void OControlExport::exportGenericHandlerAttributes()
     {
         const Sequence< Property > aProperties = m_xPropertyInfo->getProperties();
-        for (   const Property* prop = aProperties.getConstArray();
-                prop != aProperties.getConstArray() + aProperties.getLength();
-                ++prop
-            )
+        for ( auto const & prop : aProperties )
         {
             try
             {
                 // see if this property can already be handled with an IPropertyHandler (which, on the long
                 // term, should be the case for most, if not all, properties)
-                const PropertyDescription* propDescription = metadata::getPropertyDescription( prop->Name );
+                const PropertyDescription* propDescription = metadata::getPropertyDescription( prop.Name );
                 if ( propDescription == nullptr )
                     continue;
 
@@ -466,15 +463,15 @@ namespace xmloff
                 if ( propDescription->propertyGroup == NO_GROUP )
                 {
                     // that's a property which has a direct mapping to an attribute
-                    if ( !shouldExportProperty( prop->Name ) )
+                    if ( !shouldExportProperty( prop.Name ) )
                         // TODO: in the future, we surely need a more sophisticated approach to this, involving the property
                         // handler, or the property description
                     {
-                        exportedProperty( prop->Name );
+                        exportedProperty( prop.Name );
                         continue;
                     }
 
-                    const Any propValue = m_xProps->getPropertyValue( prop->Name );
+                    const Any propValue = m_xProps->getPropertyValue( prop.Name );
                     attributeValue = handler->getAttributeValue( propValue );
                 }
                 else
@@ -508,7 +505,7 @@ namespace xmloff
                     attributeValue
                 );
 
-                exportedProperty( prop->Name );
+                exportedProperty( prop.Name );
             }
             catch( const Exception& )
             {
diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx
index cd673bc58965..1340901ea420 100644
--- a/xmloff/source/forms/formcellbinding.cxx
+++ b/xmloff/source/forms/formcellbinding.cxx
@@ -252,8 +252,8 @@ bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference<
                 aAvailableServices = xDocumentFactory->getAvailableServiceNames( );
 
             const OUString* pFound = ::std::find_if(
-                aAvailableServices.getConstArray(),
-                aAvailableServices.getConstArray() + aAvailableServices.getLength(),
+                aAvailableServices.begin(),
+                aAvailableServices.end(),
                 StringCompare( _rService )
             );
             if ( pFound - aAvailableServices.getConstArray() < aAvailableServices.getLength() )
diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx
index e1241a1e600b..db8970a07e23 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.cxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.cxx
@@ -51,11 +51,9 @@ namespace xmloff
 
         sal_Int32 findStringElement( const Sequence< OUString >& _rNames, const OUString& _rName )
         {
-            const OUString* pStart = _rNames.getConstArray();
-            const OUString* pEnd = _rNames.getConstArray() + _rNames.getLength();
-            const OUString* pPos = ::std::find( pStart, pEnd, _rName );
-            if ( pPos != pEnd )
-                return pPos - pStart;
+            const OUString* pPos = ::std::find( _rNames.begin(), _rNames.end(), _rName );
+            if ( pPos != _rNames.end() )
+                return pPos - _rNames.begin();
             return -1;
         }