1 files changed, 71 insertions, 209 deletions

diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx
index fda6fafab53c..4ae220659e3c 100644
--- a/tools/source/ref/globname.cxx
+++ b/tools/source/ref/globname.cxx
@@ -17,265 +17,127 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <stdio.h>
 #include <string.h>
 
-#include <rtl/strbuf.hxx>
+#include <comphelper/mimeconfighelper.hxx>
+#include <o3tl/sprintf.hxx>
 #include <rtl/character.hxx>
 
 #include <tools/stream.hxx>
 #include <tools/globname.hxx>
 
-// ImpSvGlobalName ------------------------------------------------------------
-ImpSvGlobalName::ImpSvGlobalName( const ImpSvGlobalName & rObj )
-    : szData(rObj.szData)
-{
-}
-
-ImpSvGlobalName::ImpSvGlobalName(sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
-                          sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11,
-                          sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15)
-{
-    szData.Data1 = n1;
-    szData.Data2 = n2;
-    szData.Data3 = n3;
-    szData.Data4[0] = b8;
-    szData.Data4[1] = b9;
-    szData.Data4[2] = b10;
-    szData.Data4[3] = b11;
-    szData.Data4[4] = b12;
-    szData.Data4[5] = b13;
-    szData.Data4[6] = b14;
-    szData.Data4[7] = b15;
-}
-
-bool ImpSvGlobalName::operator == ( const ImpSvGlobalName & rObj ) const
-{
-    return !memcmp( &szData, &rObj.szData, sizeof( szData ) );
-}
-
 // SvGlobalName ----------------------------------------------------------------
-SvGlobalName::SvGlobalName()
-{
-}
-
-SvGlobalName::SvGlobalName( const SvGUID & rId ) :
-    pImp( ImpSvGlobalName( rId ) )
-{
-}
-
-SvGlobalName::SvGlobalName( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
-                            sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11,
-                            sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 ) :
-    pImp( ImpSvGlobalName(n1, n2, n3, b8, b9, b10, b11, b12, b13, b14, b15) )
-{
-}
 
 SvGlobalName::SvGlobalName( const css::uno::Sequence < sal_Int8 >& aSeq )
 {
     // create SvGlobalName from a platform independent representation
-    SvGUID aResult = {};
     if ( aSeq.getLength() == 16 )
     {
-        aResult.Data1 = ( ( ( ( ( static_cast<sal_uInt8>(aSeq[0]) << 8 ) + static_cast<sal_uInt8>(aSeq[1]) ) << 8 ) + static_cast<sal_uInt8>(aSeq[2]) ) << 8 ) + static_cast<sal_uInt8>(aSeq[3]);
-        aResult.Data2 = ( static_cast<sal_uInt8>(aSeq[4]) << 8 ) + static_cast<sal_uInt8>(aSeq[5]);
-        aResult.Data3 = ( static_cast<sal_uInt8>(aSeq[6]) << 8 ) + static_cast<sal_uInt8>(aSeq[7]);
+        m_aData.Data1 = ( ( ( ( ( static_cast<sal_uInt8>(aSeq[0]) << 8 ) + static_cast<sal_uInt8>(aSeq[1]) ) << 8 ) + static_cast<sal_uInt8>(aSeq[2]) ) << 8 ) + static_cast<sal_uInt8>(aSeq[3]);
+        m_aData.Data2 = ( static_cast<sal_uInt8>(aSeq[4]) << 8 ) + static_cast<sal_uInt8>(aSeq[5]);
+        m_aData.Data3 = ( static_cast<sal_uInt8>(aSeq[6]) << 8 ) + static_cast<sal_uInt8>(aSeq[7]);
         for( int nInd = 0; nInd < 8; nInd++ )
-            aResult.Data4[nInd] = static_cast<sal_uInt8>(aSeq[nInd+8]);
+            m_aData.Data4[nInd] = static_cast<sal_uInt8>(aSeq[nInd+8]);
     }
-
-    pImp = ::o3tl::cow_wrapper< ImpSvGlobalName >(aResult);
-}
-
-SvGlobalName::~SvGlobalName()
-{
-}
-
-SvGlobalName & SvGlobalName::operator = ( const SvGlobalName & rObj )
-{
-    pImp = rObj.pImp;
-
-    return *this;
-}
-
-SvGlobalName & SvGlobalName::operator = ( SvGlobalName && rObj ) noexcept
-{
-    pImp = std::move(rObj.pImp);
-    return *this;
 }
 
 SvStream& WriteSvGlobalName( SvStream& rOStr, const SvGlobalName & rObj )
 {
-    rOStr.WriteUInt32( rObj.pImp->szData.Data1 );
-    rOStr.WriteUInt16( rObj.pImp->szData.Data2 );
-    rOStr.WriteUInt16( rObj.pImp->szData.Data3 );
-    rOStr.WriteBytes( &rObj.pImp->szData.Data4, 8 );
+    rOStr.WriteUInt32( rObj.m_aData.Data1 );
+    rOStr.WriteUInt16( rObj.m_aData.Data2 );
+    rOStr.WriteUInt16( rObj.m_aData.Data3 );
+    rOStr.WriteBytes( &rObj.m_aData.Data4, 8 );
     return rOStr;
 }
 
 SvStream& operator >> ( SvStream& rStr, SvGlobalName & rObj )
 {
-    // the non-const dereferencing operator
-    // ensures pImp is unique
-    rStr.ReadUInt32( rObj.pImp->szData.Data1 );
-    rStr.ReadUInt16( rObj.pImp->szData.Data2 );
-    rStr.ReadUInt16( rObj.pImp->szData.Data3 );
-    rStr.ReadBytes( &rObj.pImp->szData.Data4, 8 );
+    rStr.ReadUInt32( rObj.m_aData.Data1 );
+    rStr.ReadUInt16( rObj.m_aData.Data2 );
+    rStr.ReadUInt16( rObj.m_aData.Data3 );
+    rStr.ReadBytes( &rObj.m_aData.Data4, 8 );
     return rStr;
 }
 
-
-bool SvGlobalName::operator < ( const SvGlobalName & rObj ) const
+void SvGlobalName::MakeFromMemory( void const * pData )
 {
-    if( pImp->szData.Data3 < rObj.pImp->szData.Data3 )
-        return true;
-    else if( pImp->szData.Data3 > rObj.pImp->szData.Data3 )
-        return false;
-
-    if( pImp->szData.Data2 < rObj.pImp->szData.Data2 )
-        return true;
-    else if( pImp->szData.Data2 > rObj.pImp->szData.Data2 )
-        return false;
-
-    return pImp->szData.Data1 < rObj.pImp->szData.Data1;
+    memcpy( &m_aData, pData, sizeof( m_aData ) );
 }
 
-bool SvGlobalName::operator == ( const SvGlobalName & rObj ) const
+bool SvGlobalName::MakeId( std::u16string_view rIdStr )
 {
-    return pImp == rObj.pImp;
-}
+    const sal_Unicode *pStr = rIdStr.data();
+    if( rIdStr.size() != 36
+      || '-' != pStr[ 8 ]  || '-' != pStr[ 13 ]
+      || '-' != pStr[ 18 ] || '-' != pStr[ 23 ] )
+        return false;
 
-void SvGlobalName::MakeFromMemory( void const * pData )
-{
-    memcpy( &pImp->szData, pData, sizeof( pImp->szData ) );
-}
+    SvGUID aGuid = {};
+    auto asciiHexDigitToNumber = [](sal_Unicode c) -> sal_uInt8
+    {
+        if (rtl::isAsciiDigit(c))
+            return c - '0';
+        else
+            return rtl::toAsciiUpperCase(c) - 'A' + 10;
+    };
 
-bool SvGlobalName::MakeId( const OUString & rIdStr )
-{
-    const sal_Unicode *pStr = rIdStr.getStr();
-    if( rIdStr.getLength() == 36
-      && '-' == pStr[ 8 ]  && '-' == pStr[ 13 ]
-      && '-' == pStr[ 18 ] && '-' == pStr[ 23 ] )
+    for( int i = 0; i < 8; i++ )
     {
-        sal_uInt32 nFirst = 0;
-        int i = 0;
-        for( i = 0; i < 8; i++ )
-        {
-            if( rtl::isAsciiHexDigit( *pStr ) )
-                if( rtl::isAsciiDigit( *pStr ) )
-                    nFirst = nFirst * 16 + (*pStr - '0');
-                else
-                    nFirst = nFirst * 16 + (rtl::toAsciiUpperCase( *pStr ) - 'A' + 10 );
-            else
-                return false;
-            pStr++;
-        }
+        if( !rtl::isAsciiHexDigit( *pStr ) )
+            return false;
+        aGuid.Data1 = aGuid.Data1 * 16 + asciiHexDigitToNumber( *pStr++ );
+    }
 
-        sal_uInt16 nSec = 0;
-        pStr++;
-        for( i = 0; i < 4; i++ )
-        {
-            if( rtl::isAsciiHexDigit( *pStr ) )
-                if( rtl::isAsciiDigit( *pStr ) )
-                    nSec = nSec * 16 + (*pStr - '0');
-                else
-                    nSec = nSec * 16 + static_cast<sal_uInt16>(rtl::toAsciiUpperCase( *pStr ) - 'A' + 10 );
-            else
-                return false;
-            pStr++;
-        }
+    pStr++;
+    for( int i = 0; i < 4; i++ )
+    {
+        if( !rtl::isAsciiHexDigit( *pStr ) )
+            return false;
+        aGuid.Data2 = aGuid.Data2 * 16 + asciiHexDigitToNumber( *pStr++ );
+    }
 
-        sal_uInt16 nThird = 0;
-        pStr++;
-        for( i = 0; i < 4; i++ )
-        {
-            if( rtl::isAsciiHexDigit( *pStr ) )
-                if( rtl::isAsciiDigit( *pStr ) )
-                    nThird = nThird * 16 + (*pStr - '0');
-                else
-                    nThird = nThird * 16 + static_cast<sal_uInt16>(rtl::toAsciiUpperCase( *pStr ) - 'A' + 10 );
-            else
-                return false;
-            pStr++;
-        }
+    pStr++;
+    for( int i = 0; i < 4; i++ )
+    {
+        if( !rtl::isAsciiHexDigit( *pStr ) )
+            return false;
+        aGuid.Data3 = aGuid.Data3 * 16 + asciiHexDigitToNumber( *pStr++ );
+    }
 
-        sal_Int8 szRemain[ 8 ] = {};
-        pStr++;
-        for( i = 0; i < 16; i++ )
-        {
-            if( rtl::isAsciiHexDigit( *pStr ) )
-                if( rtl::isAsciiDigit( *pStr ) )
-                    szRemain[i/2] = szRemain[i/2] * 16 + (*pStr - '0');
-                else
-                    szRemain[i/2] = szRemain[i/2] * 16 + static_cast<sal_Int8>(rtl::toAsciiUpperCase( *pStr ) - 'A' + 10 );
-            else
-                return false;
+    pStr++;
+    for( int i = 0; i < 16; i++ )
+    {
+        if( !rtl::isAsciiHexDigit( *pStr ) )
+            return false;
+        aGuid.Data4[i/2] = aGuid.Data4[i/2] * 16 + asciiHexDigitToNumber( *pStr++ );
+        if( i == 3 )
             pStr++;
-            if( i == 3 )
-                pStr++;
-        }
-
-        memcpy(&pImp->szData.Data1, &nFirst, sizeof(nFirst));
-        memcpy(&pImp->szData.Data2, &nSec, sizeof(nSec));
-        memcpy(&pImp->szData.Data3, &nThird, sizeof(nThird));
-        memcpy(&pImp->szData.Data4, szRemain, 8);
-        return true;
     }
-    return false;
+
+    m_aData = aGuid;
+    return true;
 }
 
 OUString SvGlobalName::GetHexName() const
 {
-    OStringBuffer aHexBuffer(36);
-
-    char buf[ 10 ];
-    sprintf( buf, "%8.8" SAL_PRIXUINT32, pImp->szData.Data1 );
-    aHexBuffer.append(buf);
-    aHexBuffer.append('-');
-    sprintf( buf, "%4.4X", pImp->szData.Data2 );
-    aHexBuffer.append(buf);
-    aHexBuffer.append('-');
-    sprintf( buf, "%4.4X", pImp->szData.Data3 );
-    aHexBuffer.append(buf);
-    aHexBuffer.append('-');
-    for( int i = 0; i < 2; i++ )
-    {
-        sprintf( buf, "%2.2x", pImp->szData.Data4[ i ] );
-        aHexBuffer.append(buf);
-    }
-    aHexBuffer.append('-');
-    for( int i = 2; i < 8; i++ )
-    {
-        sprintf( buf, "%2.2x", pImp->szData.Data4[ i ] );
-        aHexBuffer.append(buf);
-    }
-    return OStringToOUString(aHexBuffer.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
+    char buf[ 37 ];
+    int n = o3tl::sprintf(buf,
+                    "%8.8" SAL_PRIXUINT32 "-%4.4X-%4.4X-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
+                    m_aData.Data1, m_aData.Data2, m_aData.Data3,
+                    m_aData.Data4[0], m_aData.Data4[1], m_aData.Data4[2], m_aData.Data4[3],
+                    m_aData.Data4[4], m_aData.Data4[5], m_aData.Data4[6], m_aData.Data4[7]);
+    assert(n == 36);
+    return OUString::createFromAscii(std::string_view(buf, n));
 }
 
 css::uno::Sequence < sal_Int8 > SvGlobalName::GetByteSequence() const
 {
     // platform independent representation of a "GlobalName"
     // maybe transported remotely
-    css::uno::Sequence< sal_Int8 > aResult{
-        /* [ 0] */ static_cast<sal_Int8>(pImp->szData.Data1 >> 24),
-        /* [ 1] */ static_cast<sal_Int8>((pImp->szData.Data1 << 8 ) >> 24),
-        /* [ 2] */ static_cast<sal_Int8>((pImp->szData.Data1 << 16 ) >> 24),
-        /* [ 3] */ static_cast<sal_Int8>((pImp->szData.Data1 << 24 ) >> 24),
-        /* [ 4] */ static_cast<sal_Int8>(pImp->szData.Data2 >> 8),
-        /* [ 5] */ static_cast<sal_Int8>((pImp->szData.Data2 << 8 ) >> 8),
-        /* [ 6] */ static_cast<sal_Int8>(pImp->szData.Data3 >> 8),
-        /* [ 7] */ static_cast<sal_Int8>((pImp->szData.Data3 << 8 ) >> 8),
-        /* [ 8] */ static_cast<sal_Int8>(pImp->szData.Data4[ 0 ]),
-        /* [ 9] */ static_cast<sal_Int8>(pImp->szData.Data4[ 1 ]),
-        /* [10] */ static_cast<sal_Int8>(pImp->szData.Data4[ 2 ]),
-        /* [11] */ static_cast<sal_Int8>(pImp->szData.Data4[ 3 ]),
-        /* [12] */ static_cast<sal_Int8>(pImp->szData.Data4[ 4 ]),
-        /* [13] */ static_cast<sal_Int8>(pImp->szData.Data4[ 5 ]),
-        /* [14] */ static_cast<sal_Int8>(pImp->szData.Data4[ 6 ]),
-        /* [15] */ static_cast<sal_Int8>(pImp->szData.Data4[ 7 ])
-    };
-
-    return aResult;
+    return comphelper::MimeConfigurationHelper::GetSequenceClassID(
+        m_aData.Data1, m_aData.Data2, m_aData.Data3,
+        m_aData.Data4[0], m_aData.Data4[1], m_aData.Data4[2], m_aData.Data4[3],
+        m_aData.Data4[4], m_aData.Data4[5], m_aData.Data4[6], m_aData.Data4[7]);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */