diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-29 12:59:35 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-29 13:47:08 +0100 |
| commit | 0e57d54e1f8fe81d870ae18d6401f5ce104deb17 (patch) | |
| tree | 88fbddfb4160e18290b32ed859e8de637bd898fb /oox | |
| parent | 12ebf6f72b2b3c9f66be767933835cde848d8e48 (diff) | |
oox: replace boost::bind with std::bind
Change-Id: Ic402cfd6900cdf1741264b409f6fbe8f2db7e17a
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ole/vbacontrol.cxx | 6 | ||||
| -rw-r--r-- | oox/source/ole/vbaproject.cxx | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx index 8926acfb5cdd..1ed1e99a5d2c 100644 --- a/oox/source/ole/vbacontrol.cxx +++ b/oox/source/ole/vbacontrol.cxx @@ -407,7 +407,7 @@ void VbaFormControl::importStorage( StorageBase& rStrg, const AxClassTable& rCla stream (for embedded simple controls) or from the substorage (for embedded container controls). */ maControls.forEachMem( &VbaFormControl::importModelOrStorage, - ::boost::ref( aOStrm ), ::boost::ref( rStrg ), ::boost::cref( maClassTable ) ); + ::std::ref( aOStrm ), ::std::ref( rStrg ), ::std::cref( maClassTable ) ); // Special handling for multi-page which has non-standard // containment and additionally needs to re-order Page children @@ -495,7 +495,7 @@ bool VbaFormControl::convertProperties( const Reference< XControlModel >& rxCtrl /* Call conversion for all controls. Pass vector index as new tab order to make option button groups work correctly. */ maControls.forEachMemWithIndex( &VbaFormControl::createAndConvert, - ::boost::cref( xCtrlModelNC ), ::boost::cref( rConv ) ); + ::std::cref( xCtrlModelNC ), ::std::cref( rConv ) ); } catch(const Exception& ) { @@ -701,7 +701,7 @@ void VbaFormControl::moveEmbeddedToAbsoluteParent() } // move the embedded controls - maControls.forEachMem( &VbaFormControl::moveRelative, ::boost::cref( aDistance ) ); + maControls.forEachMem( &VbaFormControl::moveRelative, ::std::cref( aDistance ) ); } } diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index 77c6764b9d71..7cab269f4929 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -455,14 +455,14 @@ void VbaProject::importModulesAndForms( StorageBase& rVbaPrjStrg, const GraphicH if( xBasicLib.is() ) { // #TODO cater for mxOleOverridesSink, like I used to before - // call Basic source code import for each module, boost::[c]ref enforces pass-by-ref + // call Basic source code import for each module, std::[c]ref enforces pass-by-ref maModules.forEachMem( &VbaModule::createAndImportModule, - ::boost::ref( *xVbaStrg ), ::boost::cref( xBasicLib ), - ::boost::cref( xDocObjectNA ) ); + ::std::ref( *xVbaStrg ), ::std::cref( xBasicLib ), + ::std::cref( xDocObjectNA ) ); // create empty dummy modules aDummyModules.forEachMem( &VbaModule::createEmptyModule, - ::boost::cref( xBasicLib ), ::boost::cref( xDocObjectNA ) ); + ::std::cref( xBasicLib ), ::std::cref( xDocObjectNA ) ); } } catch(const Exception& ) @@ -516,7 +516,7 @@ void VbaProject::attachMacros() aArgs[ 1 ] <<= maPrjName; Reference< XVBAMacroResolver > xResolver( xFactory->createInstanceWithArgumentsAndContext( "com.sun.star.script.vba.VBAMacroResolver", aArgs, mxContext ), UNO_QUERY_THROW ); - maMacroAttachers.forEachMem( &VbaMacroAttacherBase::resolveAndAttachMacro, ::boost::cref( xResolver ) ); + maMacroAttachers.forEachMem( &VbaMacroAttacherBase::resolveAndAttachMacro, ::std::cref( xResolver ) ); } catch(const Exception& ) { |