From c593567b68d353ca13206e7ee62c4a0f8348d987 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 31 May 2022 14:57:39 +0200
Subject: UUIInteractionRequestStringResolver::m_pImpl can be a plain data
 member

Change-Id: I1daed58cec87d192118f027ce1843e56b17da19b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135186
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 uui/source/requeststringresolver.cxx | 2 +-
 uui/source/requeststringresolver.hxx | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'uui')

diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx
index 8bcb78bfea8d..baaaf088713c 100644
--- a/uui/source/requeststringresolver.cxx
+++ b/uui/source/requeststringresolver.cxx
@@ -63,7 +63,7 @@ UUIInteractionRequestStringResolver::getStringFromInformationalRequest(
 {
     try
     {
-        return m_pImpl->getStringFromRequest(Request);
+        return m_pImpl.getStringFromRequest(Request);
     }
     catch (uno::RuntimeException const & ex)
     {
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index 9456444a43f4..f9c95d87f6f5 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
 #include "iahndl.hxx"
-#include <optional>
 
 class UUIInteractionRequestStringResolver:
     public cppu::WeakImplHelper<
@@ -36,7 +35,7 @@ public:
         css::uno::Reference< css::uno::XComponentContext > const & rxContext);
 
 private:
-    std::optional<UUIInteractionHelper> m_pImpl;
+    UUIInteractionHelper m_pImpl;
 
     UUIInteractionRequestStringResolver(UUIInteractionRequestStringResolver const &) = delete;
     void operator =(UUIInteractionRequestStringResolver const &) = delete;
-- 
cgit