From f14d64fa71565e86c98348f9c54cc6cab53649d8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 31 Dec 2015 10:26:43 +0200 Subject: these fields can be static constants Change-Id: Id56e219782d7f858cdeb26232c7aabd4f643c9d9 Reviewed-on: https://gerrit.libreoffice.org/21020 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- oox/source/ole/oleobjecthelper.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'oox') 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 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); -- cgit