summaryrefslogtreecommitdiff
path: root/include/toolkit/controls/unocontrols.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'include/toolkit/controls/unocontrols.hxx')
-rw-r--r--include/toolkit/controls/unocontrols.hxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 683c6f1901e3..4c8f696d2c3c 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -54,7 +54,7 @@
#include <memory>
#include <vector>
-#include <o3tl/optional.hxx>
+#include <optional>
namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
namespace com { namespace sun { namespace star { namespace graphic { class XGraphicObject; } } } }
@@ -784,15 +784,15 @@ protected:
private:
void impl_notifyItemListEvent_nolck(
const sal_Int32 i_nItemPosition,
- const ::o3tl::optional< OUString >& i_rItemText,
- const ::o3tl::optional< OUString >& i_rItemImageURL,
+ const ::std::optional< OUString >& i_rItemText,
+ const ::std::optional< OUString >& i_rItemImageURL,
void ( SAL_CALL css::awt::XItemListListener::*NotificationMethod )( const css::awt::ItemListEvent& )
);
void impl_handleInsert(
const sal_Int32 i_nItemPosition,
- const ::o3tl::optional< OUString >& i_rItemText,
- const ::o3tl::optional< OUString >& i_rItemImageURL,
+ const ::std::optional< OUString >& i_rItemText,
+ const ::std::optional< OUString >& i_rItemImageURL,
::osl::ClearableMutexGuard& i_rClearBeforeNotify
);
@@ -803,8 +803,8 @@ private:
void impl_handleModify(
const sal_Int32 i_nItemPosition,
- const ::o3tl::optional< OUString >& i_rItemText,
- const ::o3tl::optional< OUString >& i_rItemImageURL,
+ const ::std::optional< OUString >& i_rItemText,
+ const ::std::optional< OUString >& i_rItemImageURL,
::osl::ClearableMutexGuard& i_rClearBeforeNotify
);