diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-24 14:09:52 +0000 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-05 08:17:26 -0500 |
| commit | 1c5dfa9bd3c24fdeec92e8334461a70d07202f0f (patch) | |
| tree | 554d001432abd5518f366eef314a0918a9b6c5e8 /include | |
| parent | ab087a1254cf8074b2cf14cb8eee1cbdfd1b1f3e (diff) | |
vector::data seems more natural than &vector::front
Change-Id: I0ce48075ad186cf1f9bd3e13fa76269fa9819af1
(cherry picked from commit 3a74745367a73ed9351379fc32bbe9253cdae697)
(cherry picked from commit 3437713c11d60f99470fc1d0e2a8e5c56d5a6fe8)
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/helper/binaryinputstream.hxx | 2 | ||||
| -rw-r--r-- | include/oox/helper/containerhelper.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index 2e952d3ba9e5..00c4dcf89b0f 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -242,7 +242,7 @@ template< typename Type > sal_Int32 BinaryInputStream::readArray( ::std::vector< Type >& orVector, sal_Int32 nElemCount ) { orVector.resize( static_cast< size_t >( nElemCount ) ); - return orVector.empty() ? 0 : readArray( &orVector.front(), nElemCount ); + return orVector.empty() ? 0 : readArray(orVector.data(), nElemCount); } diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx index 016df0d60d3f..de6fbceebe3a 100644 --- a/include/oox/helper/containerhelper.hxx +++ b/include/oox/helper/containerhelper.hxx @@ -293,7 +293,7 @@ template< typename VectorType > typedef typename VectorType::value_type ValueType; if( rVector.empty() ) return css::uno::Sequence< ValueType >(); - return css::uno::Sequence< ValueType >( &rVector.front(), static_cast< sal_Int32 >( rVector.size() ) ); + return css::uno::Sequence<ValueType>(rVector.data(), static_cast<sal_Int32>(rVector.size())); } template< typename MatrixType > |