diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-12-31 10:26:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-01-04 14:44:33 +0000 |
| commit | f14d64fa71565e86c98348f9c54cc6cab53649d8 (patch) | |
| tree | 830034b8c4ac9e9bf83f049fabb3138f9a854486 /oox | |
| parent | 549e900b4b0047b8cb6c236ea50a3fc046e5fb51 (diff) | |
these fields can be static constants
Change-Id: Id56e219782d7f858cdeb26232c7aabd4f643c9d9
Reviewed-on: https://gerrit.libreoffice.org/21020
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ole/oleobjecthelper.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx index 12356c35d515..d55dc65f8df4 100644 --- a/oox/source/ole/oleobjecthelper.cxx +++ b/oox/source/ole/oleobjecthelper.cxx @@ -49,11 +49,12 @@ OleObjectInfo::OleObjectInfo() : { } +static const char g_aEmbeddedObjScheme[] = "vnd.sun.star.EmbeddedObject:"; + OleObjectHelper::OleObjectHelper( const Reference< XMultiServiceFactory >& rxModelFactory, uno::Reference<frame::XModel> const& xModel) : m_xModel(xModel) - , maEmbeddedObjScheme("vnd.sun.star.EmbeddedObject:") , mnObjectId( 100 ) { assert(m_xModel.is()); @@ -150,8 +151,8 @@ bool OleObjectHelper::importOleObject( PropertyMap& rPropMap, const OleObjectInf rOleObject.mbShowAsIcon ? OUString("Icon") : OUString("Content")); OUString aUrl = mxResolver->resolveEmbeddedObjectURL( aObjectId ); - OSL_ENSURE( aUrl.match( maEmbeddedObjScheme ), "OleObjectHelper::importOleObject - unexpected URL scheme" ); - OUString aPersistName = aUrl.copy( maEmbeddedObjScheme.getLength() ); + OSL_ENSURE( aUrl.match( g_aEmbeddedObjScheme ), "OleObjectHelper::importOleObject - unexpected URL scheme" ); + OUString aPersistName = aUrl.copy( strlen(g_aEmbeddedObjScheme) ); if( !aPersistName.isEmpty() ) { rPropMap.setProperty( PROP_PersistName, aPersistName); |