diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-08-26 18:37:44 +0200 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-08-26 18:37:44 +0200 |
| commit | 04c272eb8396e58376d2b61baee01c4a95f993b4 (patch) | |
| tree | 489606116a897ec3c0186161269670b0e8c66146 /oox/source/ole/axcontrolfragment.cxx | |
| parent | 4d9f54e9f020c91c7fda048bcf3f7549d58bc2b4 (diff) | |
dr77: #i114128# import legacy drawing controls
Diffstat (limited to 'oox/source/ole/axcontrolfragment.cxx')
| -rw-r--r-- | oox/source/ole/axcontrolfragment.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/ole/axcontrolfragment.cxx b/oox/source/ole/axcontrolfragment.cxx index ecd782da2cb0..b57807a41df6 100644 --- a/oox/source/ole/axcontrolfragment.cxx +++ b/oox/source/ole/axcontrolfragment.cxx @@ -105,7 +105,7 @@ ContextHandlerRef AxControlFragment::onCreateContext( sal_Int32 nElement, const switch( rAttribs.getToken( AX_TOKEN( persistence ), XML_TOKEN_INVALID ) ) { case XML_persistPropertyBag: - if( ControlModelBase* pModel = mrControl.createModel( aClassId ).get() ) + if( ControlModelBase* pModel = mrControl.createModelFromGuid( aClassId ) ) return new AxControlPropertyContext( *this, *pModel ); break; @@ -121,7 +121,7 @@ ContextHandlerRef AxControlFragment::onCreateContext( sal_Int32 nElement, const OUString aStrmClassId = OleHelper::importGuid( aInStrm ); OSL_ENSURE( aClassId.equalsIgnoreAsciiCase( aStrmClassId ), "AxControlFragment::importBinaryControl - form control class ID mismatch" ); - if( ControlModelBase* pModel = mrControl.createModel( aStrmClassId ).get() ) + if( ControlModelBase* pModel = mrControl.createModelFromGuid( aStrmClassId ) ) pModel->importBinaryModel( aInStrm ); } } @@ -139,7 +139,7 @@ ContextHandlerRef AxControlFragment::onCreateContext( sal_Int32 nElement, const OleStorage aStorage( getFilter().getGlobalFactory(), xStrgStrm, false ); BinaryXInputStream aInStrm( aStorage.openInputStream( CREATE_OUSTRING( "f" ) ), true ); if( !aInStrm.isEof() ) - if( AxContainerModelBase* pModel = dynamic_cast< AxContainerModelBase* >( mrControl.createModel( aClassId ).get() ) ) + if( AxContainerModelBase* pModel = dynamic_cast< AxContainerModelBase* >( mrControl.createModelFromGuid( aClassId ) ) ) pModel->importBinaryModel( aInStrm ); } } |