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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/doc/oleprops.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/sidebar/Theme.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index 809200f95987..15f06a51beb8 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -277,9 +277,9 @@ OUString SfxOleStringHelper::ImplLoadString8( SvStream& rStrm ) const { // load character buffer ::std::vector< sal_Char > aBuffer( static_cast< size_t >( nSize + 1 ), 0 ); - rStrm.ReadBytes(&aBuffer.front(), static_cast<std::size_t>(nSize)); + rStrm.ReadBytes(aBuffer.data(), static_cast<std::size_t>(nSize)); // create string from encoded character array - aValue = OUString( &aBuffer.front(), strlen( &aBuffer.front() ), GetTextEncoding() ); + aValue = OUString(aBuffer.data(), strlen(aBuffer.data()), GetTextEncoding()); } return aValue; } @@ -308,7 +308,7 @@ OUString SfxOleStringHelper::ImplLoadString16( SvStream& rStrm ) rStrm.SeekRel( 2 ); // create string from character array aBuffer.push_back( 0 ); - aValue = OUString( &aBuffer.front() ); + aValue = OUString(aBuffer.data()); } return aValue; } diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index 17f7b19eaff4..ecf005a499a5 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -591,7 +591,7 @@ css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties() } return css::uno::Sequence<css::beans::Property>( - &aProperties.front(), + aProperties.data(), aProperties.size()); } |