3 files changed, 9 insertions, 6 deletions
diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx
index 34723ef74123..4e03a54fd3be 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.hxx
@@ -23,6 +23,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <vector>
 #include <memory>
+#include <optional>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 namespace com::sun::star::uno { class XComponentContext; }
@@ -81,8 +82,8 @@ private:
             aLocale.Variant == rLocale.Variant;
         };
     };
-    std::vector<std::unique_ptr<lookupTableItem>> lookupTable;
-    lookupTableItem *cachedItem;
+    std::vector<lookupTableItem> lookupTable;
+    std::optional<lookupTableItem> cachedItem;
 
     css::uno::Reference < css::uno::XComponentContext > m_xContext;
     css::uno::Reference < XCharacterClassification > xUCI;
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index 14a4489a256a..c1068638d8bc 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.hxx
@@ -27,6 +27,7 @@
 
 #include <vector>
 #include <memory>
+#include <optional>
 
 namespace com::sun::star::i18n { class XLocaleData5; }
 namespace com::sun::star::uno { class XComponentContext; }
@@ -89,8 +90,8 @@ private:
             algorithm == _algorithm;
         }
     };
-    std::vector<std::unique_ptr<lookupTableItem>>       lookupTable;
-    lookupTableItem *                                   cachedItem;
+    std::vector<lookupTableItem>       lookupTable;
+    std::optional<lookupTableItem>     cachedItem;
 
     // Service Factory
     css::uno::Reference < css::uno::XComponentContext > m_xContext;
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index 52963b3be171..eff426f5caa3 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -25,6 +25,7 @@
 
 #include <vector>
 #include <memory>
+#include <optional>
 
 namespace com::sun::star::uno { class XComponentContext; }
 
@@ -63,8 +64,8 @@ private:
         const char* aLanguage;
         css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > xISC;
     };
-    std::vector<std::unique_ptr<lookupTableItem>> lookupTable;
-    lookupTableItem *cachedItem;
+    std::vector<lookupTableItem> lookupTable;
+    std::optional<lookupTableItem> cachedItem;
 
     css::uno::Reference < css::uno::XComponentContext > m_xContext;