diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-26 13:12:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-26 13:13:42 +0200 |
| commit | ed085a6d2043e1da6b50a9d00742b812c9ff0247 (patch) | |
| tree | 2301c4fd94cecc102111b2ad80b253b9883e0552 /filter | |
| parent | dd2b8472a97d1ab01111f9969b046a1c2ec5586a (diff) | |
cleanup GUID/ClsId/CLSID types
- rename GUID to SvGUID so we don't need an #ifdef WIN32
- drop ClsId struct, since it is used interchangeably with GUID and has
the same structure
Change-Id: Idf5c14c82a6861ef585fb57896a9b12cfe40374c
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 197b8696ea84..0d99c9d57418 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1822,9 +1822,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, { if ( xObjStor->GetClassName() == SvGlobalName() ) { - ClsId aId( pObjStor->GetClassId() ); - xObjStor->SetClass( SvGlobalName( aId.n1, aId.n2, aId.n3, aId.n4, aId.n5, aId.n6, aId.n7, aId.n8, aId.n9, aId.n10, aId.n11 ), - pObjStor->GetFormat(), pObjStor->GetUserName() ); + xObjStor->SetClass( SvGlobalName( pObjStor->GetClassId() ), pObjStor->GetFormat(), pObjStor->GetUserName() ); } SotStorageStreamRef xSrcTst = xObjStor->OpenSotStream( "\1Ole" ); if ( xSrcTst.Is() ) |