diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2022-03-27 22:52:48 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2022-04-05 01:57:21 +0200 |
| commit | cf4d5ed026c8799a70432a832a8a707c2e316216 (patch) | |
| tree | 0b30a1863b4331208eca9454579714ff8e725d23 /sc | |
| parent | be7d84a3fbd47bf9a078ac7e6854bc4927e84933 (diff) | |
add tools::Guid class to generate, parse GUID values
Change-Id: Ie4d8fad4d8f22c8277c22c21b7a9eb3e7c9e4f1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132513
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xcl97/XclExpChangeTrack.cxx | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index 5ebe27d36103..2ef1b5bce3e2 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -29,6 +29,7 @@ #include <document.hxx> #include <editutil.hxx> #include <root.hxx> +#include <tools/Guid.hxx> #include <oox/export/utils.hxx> #include <oox/token/namespaces.hxx> @@ -38,16 +39,6 @@ using namespace oox; -static OString lcl_GuidToOString( sal_uInt8 aGuid[ 16 ] ) -{ - char sBuf[ 40 ]; - snprintf( sBuf, sizeof( sBuf ), - "{%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - aGuid[ 0 ], aGuid[ 1 ], aGuid[ 2 ], aGuid[ 3 ], aGuid[ 4 ], aGuid[ 5 ], aGuid[ 6 ], aGuid[ 7 ], - aGuid[ 8 ], aGuid[ 9 ], aGuid[ 10 ], aGuid[ 11 ], aGuid[ 12 ], aGuid[ 13 ], aGuid[ 14 ], aGuid[ 15 ] ); - return OString(sBuf); -} - static OString lcl_DateTimeToOString( const DateTime& rDateTime ) { char sBuf[ 200 ]; @@ -351,8 +342,9 @@ std::size_t XclExpChTrHeader::GetLen() const void XclExpChTrHeader::SaveXml( XclExpXmlStream& rRevisionHeadersStrm ) { sax_fastparser::FSHelperPtr pHeaders = rRevisionHeadersStrm.GetCurrentStream(); + tools::Guid aGuid(aGUID); rRevisionHeadersStrm.WriteAttributes( - XML_guid, lcl_GuidToOString(aGUID), + XML_guid, aGuid.getString(), XML_lastGuid, nullptr, // OOXTODO XML_shared, nullptr, // OOXTODO XML_diskRevisions, nullptr, // OOXTODO @@ -378,10 +370,11 @@ void XclExpXmlChTrHeaders::SaveXml( XclExpXmlStream& rStrm ) pHeaders->write("<")->writeId(XML_headers); + tools::Guid aGuid(maGUID); rStrm.WriteAttributes( XML_xmlns, rStrm.getNamespaceURL(OOX_NS(xls)), FSNS(XML_xmlns, XML_r), rStrm.getNamespaceURL(OOX_NS(officeRel)), - XML_guid, lcl_GuidToOString(maGUID), + XML_guid, aGuid.getString(), XML_lastGuid, nullptr, // OOXTODO XML_shared, nullptr, // OOXTODO XML_diskRevisions, nullptr, // OOXTODO @@ -426,8 +419,9 @@ void XclExpXmlChTrHeader::SaveXml( XclExpXmlStream& rStrm ) CREATE_OFFICEDOC_RELATION_TYPE("revisionLog"), &aRelId); + tools::Guid aGuid(maGUID); rStrm.WriteAttributes( - XML_guid, lcl_GuidToOString(maGUID), + XML_guid, aGuid.getString(), XML_dateTime, lcl_DateTimeToOString(maDateTime), XML_userName, maUserName, FSNS(XML_r, XML_id), aRelId); |