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 /include | |
| 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 'include')
| -rw-r--r-- | include/sot/stg.hxx | 7 | ||||
| -rw-r--r-- | include/tools/globname.hxx | 23 |
2 files changed, 12 insertions, 18 deletions
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx index b42ed4c7f590..2d8b1d1d1186 100644 --- a/include/sot/stg.hxx +++ b/include/sot/stg.hxx @@ -43,12 +43,7 @@ class StgIo; class StgDirEntry; class StgStrm; class SvGlobalName; -struct ClsId -{ - sal_Int32 n1; - sal_Int16 n2, n3; - sal_uInt8 n4, n5, n6, n7, n8, n9, n10, n11; -}; +typedef struct SvGUID ClsId; class SOT_DLLPUBLIC StorageBase : public SvRefBase { diff --git a/include/tools/globname.hxx b/include/tools/globname.hxx index 8bd996f779ff..4defc52f201f 100644 --- a/include/tools/globname.hxx +++ b/include/tools/globname.hxx @@ -24,9 +24,17 @@ #include <tools/toolsdllapi.h> #include <com/sun/star/uno/Sequence.hxx> +struct SvGUID +{ + sal_uInt32 Data1; + sal_uInt16 Data2; + sal_uInt16 Data3; + sal_uInt8 Data4[8]; +}; + struct ImpSvGlobalName { - sal_uInt8 szData[ 16 ]; + struct SvGUID szData; sal_uInt16 nRefCount; enum Empty { EMPTY }; @@ -41,14 +49,6 @@ struct ImpSvGlobalName bool operator == ( const ImpSvGlobalName & rObj ) const; }; -#ifdef WNT -struct _GUID; -typedef struct _GUID GUID; -#else -struct GUID; -#endif - -typedef GUID CLSID; class SvStream; class TOOLS_DLLPUBLIC SvGlobalName @@ -93,9 +93,8 @@ public: bool MakeId( const OUString & rId ); OUString GetHexName() const; - SvGlobalName( const CLSID & rId ); - const CLSID & GetCLSID() const { return *(CLSID *)pImp->szData; } - const sal_uInt8* GetBytes() const { return pImp->szData; } + SvGlobalName( const SvGUID & rId ); + const SvGUID& GetCLSID() const { return pImp->szData; } // platform independent representation of a "GlobalName" // maybe transported remotely |