vcl/inc/displayconnectiondispatch.hxx | 1 -
vcl/source/helper/displayconnectiondispatch.cxx | 6 ------
vcl/unx/generic/dtrans/X11_selection.cxx | 7 +++----
3 files changed, 3 insertions(+), 11 deletions(-)
New commits:
commit 2adcb38ab7c984098706125978ea878951f5ab87
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Jul 4 16:46:37 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Jul 5 07:45:48 2025 +0200
vcl: Move connection identifer logic out of DisplayConnectionDispatch
No need to have this as a member in
DisplayConnectionDispatch, get it from the SalInstance
directly when needed.
Change-Id: I9223f3b59d0c811632d4cf66b1a1dbae73a032ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187406
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/inc/displayconnectiondispatch.hxx
b/vcl/inc/displayconnectiondispatch.hxx
index f8d41393b03b..0e7d4540e256 100644
--- a/vcl/inc/displayconnectiondispatch.hxx
+++ b/vcl/inc/displayconnectiondispatch.hxx
@@ -52,7 +52,6 @@ public:
void addEventHandler(const rtl::Reference<DisplayEventHandler>& handler);
void removeEventHandler(const rtl::Reference<DisplayEventHandler>&
handler);
- OUString getIdentifier();
};
}
diff --git a/vcl/source/helper/displayconnectiondispatch.cxx
b/vcl/source/helper/displayconnectiondispatch.cxx
index 54e0358b7146..be050547a726 100644
--- a/vcl/source/helper/displayconnectiondispatch.cxx
+++ b/vcl/source/helper/displayconnectiondispatch.cxx
@@ -30,7 +30,6 @@ using namespace com::sun::star::awt;
DisplayConnectionDispatch::DisplayConnectionDispatch()
{
- m_ConnectionIdentifier =
ImplGetSVData()->mpDefInst->GetConnectionIdentifier();
}
DisplayConnectionDispatch::~DisplayConnectionDispatch()
@@ -76,11 +75,6 @@ void DisplayConnectionDispatch::removeEventHandler(
std::erase(m_aHandlers, handler);
}
-OUString DisplayConnectionDispatch::getIdentifier()
-{
- return m_ConnectionIdentifier;
-}
-
bool DisplayConnectionDispatch::dispatchEvent(const void* pEvent)
{
SolarMutexReleaser aRel;
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx
b/vcl/unx/generic/dtrans/X11_selection.cxx
index edfef0920e9d..b9cbb39c392a 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -23,6 +23,7 @@
#include <cstdlib>
#include <thread>
+#include <salinst.hxx>
#include <unx/saldisp.hxx>
#include <unistd.h>
@@ -342,9 +343,7 @@ void SelectionManager::initialize()
if( m_pDisplay )
return;
- OUString aUDisplay;
- if( m_xDisplayConnection.is() )
- aUDisplay = m_xDisplayConnection->getIdentifier();
+ const OUString aUDisplay =
ImplGetSVData()->mpDefInst->GetConnectionIdentifier();
OString aDisplayName( OUStringToOString( aUDisplay,
RTL_TEXTENCODING_ISO_8859_1 ) );
commit 7e76b2d8feee2f230c0a7d186789d6da002f9d9d
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Jul 4 16:36:10 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Jul 5 07:45:39 2025 +0200
gen: Update comment
This is no longer an XEventHandler after
Change-Id: Iaf08f4aee3fea99d9d5d5c907d107452812d187d
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Fri Jul 4 14:51:17 2025 +0200
vcl: No longer use css::awt::XEventHandler
Change-Id: Ibce42e9040fd716c7b85ff5ee8ae8a6905750165
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187405
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx
b/vcl/unx/generic/dtrans/X11_selection.cxx
index 5a5f0a38fa42..edfef0920e9d 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -325,7 +325,7 @@ void SelectionManager::initialize()
{
/*
* We will get the XEvents of the vcl event loop from the display
connection by
- * registering us as XEventHandler on it.
+ * registering ourselves as an event handler for it.
*
* implementor's note:
* FIXME:
