diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-08 13:04:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-09 09:51:05 +0000 |
| commit | bca47d830eaf13f6032985982582dce3fd335e4e (patch) | |
| tree | ae298bfdea100be0dcbdd86fd8bfaf757d160409 /vcl/source | |
| parent | 4ccdf7932e84bd78a366bb4ae2785c63e33a9403 (diff) | |
remove ConnectionIdentifierType enum
since we only use the AsciiCString enumerator.
Consequently simplify the GetConnectionIdentifier method
Change-Id: I9e1a1318d2f12bfd18edeb8479e0e7171b22d0f1
Reviewed-on: https://gerrit.libreoffice.org/34026
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/helper/displayconnectiondispatch.cxx | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/vcl/source/helper/displayconnectiondispatch.cxx b/vcl/source/helper/displayconnectiondispatch.cxx index 60851598ba08..5b3731e93a9f 100644 --- a/vcl/source/helper/displayconnectiondispatch.cxx +++ b/vcl/source/helper/displayconnectiondispatch.cxx @@ -30,18 +30,7 @@ using namespace com::sun::star::awt; DisplayConnectionDispatch::DisplayConnectionDispatch() { - SalInstance::ConnectionIdentifierType eType; - int nBytes; - void* pBytes = ImplGetSVData()->mpDefInst->GetConnectionIdentifier( eType, nBytes ); - switch( eType ) - { - case SalInstance::AsciiCString: - m_aAny <<= OUString::createFromAscii( static_cast<sal_Char*>(pBytes) ); - break; - case SalInstance::Blob: - m_aAny <<= Sequence< sal_Int8 >( static_cast<sal_Int8*>(pBytes), nBytes ); - break; - } + m_ConnectionIdentifier = ImplGetSVData()->mpDefInst->GetConnectionIdentifier(); } DisplayConnectionDispatch::~DisplayConnectionDispatch() @@ -103,7 +92,7 @@ void SAL_CALL DisplayConnectionDispatch::removeErrorHandler( const css::uno::Ref Any SAL_CALL DisplayConnectionDispatch::getIdentifier() { - return m_aAny; + return Any(m_ConnectionIdentifier); } bool DisplayConnectionDispatch::dispatchEvent( void* pData, int nBytes ) |