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/unx/generic/app/salinst.cxx | |
| 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/unx/generic/app/salinst.cxx')
| -rw-r--r-- | vcl/unx/generic/app/salinst.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
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 ) |