vcl/inc/unx/salinst.h | 2 -- vcl/unx/generic/app/salinst.cxx | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-)
New commits: commit d368a9f6d5c11da8df92855e06d7d893d5b560f2 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Mar 2 04:34:16 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Mar 2 17:17:29 2026 +0100 vcl: Merge X11SalInstance::CreateDisplay into only caller Change-Id: I545beae67ea1cccd282dd905ac90d159a63bb3a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200757 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h index bcf9d1359e22..e29a24c4552a 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -36,8 +36,6 @@ private: SalXLib *mpXLib; - SalX11Display* CreateDisplay() const; - public: explicit X11SalInstance(std::unique_ptr<SalYieldMutex> pMutex); virtual ~X11SalInstance() override; diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index 57039abc11d9..cc35c94cbf5f 100644 --- a/vcl/unx/generic/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -89,11 +89,6 @@ X11SalInstance::~X11SalInstance() #endif } -SalX11Display* X11SalInstance::CreateDisplay() const -{ - return new SalX11Display( mpXLib->GetDisplay() ); -} - // AnyInput from sv/mow/source/app/svapp.cxx namespace { @@ -205,7 +200,7 @@ void X11SalInstance::AfterAppInit() assert( mpXLib->GetDisplay() ); assert( mpXLib->GetInputMethod() ); - SalX11Display *pSalDisplay = CreateDisplay(); + SalX11Display* pSalDisplay = new SalX11Display(mpXLib->GetDisplay()); mpXLib->GetInputMethod()->CreateMethod( mpXLib->GetDisplay() ); pSalDisplay->SetupInput(); }
