diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-05-22 13:49:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-05-22 16:35:20 +0200 |
| commit | c18e2ea2a52fc171c50fcb22d431e94c6aececc5 (patch) | |
| tree | a63721b18626947e5278a51feb7fd64604e80eee /oox | |
| parent | 7cf4bcef41448218f76fa1e974f541e13dc03023 (diff) | |
New loplugin:data
...following up on 1453c2c8f13bac64ecd1981af7cebf1c421808ac "prefer vector::data
to &vector[0]"
Change-Id: I7c113747d92d144a521d49b89384dd8bf1215c01
Reviewed-on: https://gerrit.libreoffice.org/72765
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/vmlexport.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index 0ffae0d5e236..eaf761a5d168 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -495,8 +495,8 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle& if ( rProps.GetOpt( ESCHER_Prop_pVertices, aVertices ) && rProps.GetOpt( ESCHER_Prop_pSegmentInfo, aSegments ) ) { - const sal_uInt8 *pVerticesIt = &aVertices.nProp[0] + 6; - const sal_uInt8 *pSegmentIt = &aSegments.nProp[0]; + const sal_uInt8 *pVerticesIt = aVertices.nProp.data() + 6; + const sal_uInt8 *pSegmentIt = aSegments.nProp.data(); OStringBuffer aPath( 512 ); sal_uInt16 nPointSize = aVertices.nProp[4] + ( aVertices.nProp[5] << 8 ); @@ -686,7 +686,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle& SvMemoryStream aStream; // The first bytes are WW8-specific, we're only interested in the PNG int nHeaderSize = 25; - aStream.WriteBytes(&aStruct.nProp[0] + nHeaderSize, + aStream.WriteBytes(aStruct.nProp.data() + nHeaderSize, aStruct.nProp.size() - nHeaderSize); aStream.Seek(0); Graphic aGraphic; @@ -899,7 +899,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle& if(!opt.nProp.empty()) { - aStream.WriteBytes(&opt.nProp[0], opt.nProp.size()); + aStream.WriteBytes(opt.nProp.data(), opt.nProp.size()); } aStream.Seek(0); @@ -916,7 +916,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle& OUString aStyle; if (rProps.GetOpt(ESCHER_Prop_gtextFont, aFont)) { - aStream.WriteBytes(&aFont.nProp[0], aFont.nProp.size()); + aStream.WriteBytes(aFont.nProp.data(), aFont.nProp.size()); aStream.Seek(0); OUString aTextPathFont = SvxMSDffManager::MSDFFReadZString(aStream, aFont.nProp.size(), true); aStyle += "font-family:\"" + aTextPathFont + "\""; @@ -960,7 +960,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle& if(!opt.nProp.empty()) { - aStream.WriteBytes(&opt.nProp[0], opt.nProp.size()); + aStream.WriteBytes(opt.nProp.data(), opt.nProp.size()); } aStream.Seek(0); @@ -980,10 +980,10 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle& nId, opt.nPropValue, opt_nProp_size, - 0 == opt_nProp_size ? &opt_nProp_empty : &opt.nProp[0]); + 0 == opt_nProp_size ? &opt_nProp_empty : opt.nProp.data()); if ( opt.nProp.size() ) { - const sal_uInt8 *pIt = &opt.nProp[0]; + const sal_uInt8 *pIt = opt.nProp.data(); fprintf( stderr, " ( " ); for ( int nCount = opt.nProp.size(); nCount; --nCount ) { |