From bca47d830eaf13f6032985982582dce3fd335e4e Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Wed, 8 Feb 2017 13:04:44 +0200
Subject: 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>
---
 vcl/unx/generic/app/salinst.cxx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'vcl/unx/generic')

diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index cf433df4c1ff..88b4b2b7677c 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -174,13 +174,10 @@ SalYieldResult X11SalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents,
     return mpXLib->Yield( bWait, bHandleAllCurrentEvents );
 }
 
-void* X11SalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType,
-                                               int& rReturnedBytes )
+OUString X11SalInstance::GetConnectionIdentifier()
 {
     static const char* pDisplay = getenv( "DISPLAY" );
-    rReturnedType   = AsciiCString;
-    rReturnedBytes  = pDisplay ? strlen( pDisplay )+1 : 1;
-    return pDisplay ? const_cast<char *>(pDisplay) : const_cast<char *>("");
+    return pDisplay ? OUString::createFromAscii(pDisplay) : OUString("");
 }
 
 SalFrame *X11SalInstance::CreateFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle )
-- 
cgit