summaryrefslogtreecommitdiffstats
path: root/include/dbaccess
diff options
context:
space:
mode:
Diffstat (limited to 'include/dbaccess')
-rw-r--r--include/dbaccess/genericcontroller.hxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx
index 60c75236475f..805131548f28 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -27,7 +27,7 @@
#include <memory>
#include <vector>
-#include <o3tl/optional.hxx>
+#include <optional>
#include <com/sun/star/awt/XUserInputInterception.hpp>
#include <com/sun/star/frame/CommandGroup.hpp>
@@ -94,7 +94,7 @@ namespace dbaui
class ODataView;
template< typename T >
- inline bool SAL_CALL operator >>= (const css::uno::Any& _any, o3tl::optional< T >& _value)
+ inline bool SAL_CALL operator >>= (const css::uno::Any& _any, std::optional< T >& _value)
{
_value.reset(); // de-init the optional value
@@ -118,10 +118,10 @@ namespace dbaui
{
bool bEnabled;
- o3tl::optional<bool> bChecked;
- o3tl::optional<bool> bInvisible;
+ std::optional<bool> bChecked;
+ std::optional<bool> bInvisible;
css::uno::Any aValue;
- o3tl::optional<OUString> sTitle;
+ std::optional<OUString> sTitle;
FeatureState() : bEnabled(false) { }
};