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 /sot/source/sdstor/stg.cxx | |
| 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 'sot/source/sdstor/stg.cxx')
| -rw-r--r-- | sot/source/sdstor/stg.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index d6ae01ea7cea..84219df91e69 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -977,11 +977,11 @@ SvGlobalName Storage::GetClassName() { StgCompObjStream aCompObj( *this, false ); if( aCompObj.Load() ) - return SvGlobalName( (const CLSID&) aCompObj.GetClsId() ); + return SvGlobalName( aCompObj.GetClsId() ); pIo->ResetError(); if ( pEntry ) - return SvGlobalName( (const CLSID&) pEntry->aEntry.GetClassId() ); + return SvGlobalName( pEntry->aEntry.GetClassId() ); return SvGlobalName(); } @@ -1041,7 +1041,7 @@ const ClsId& Storage::GetClassId() const if ( pEntry ) return pEntry->aEntry.GetClassId(); - static ClsId aDummyId = {0,0,0,0,0,0,0,0,0,0,0}; + static ClsId aDummyId = {0,0,0,{0,0,0,0,0,0,0,0}}; return aDummyId; } |