diff options
Diffstat (limited to 'vcl/inc/window.h')
| -rw-r--r-- | vcl/inc/window.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 11271261f335..f4f4d6b29eb4 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -31,7 +31,7 @@ #include <o3tl/typed_flags_set.hxx> #include <cppuhelper/weakref.hxx> -#include <o3tl/optional.hxx> +#include <optional> #include <list> #include <memory> #include <vector> @@ -97,20 +97,20 @@ bool ImplWindowFrameProc( vcl::Window* pInst, SalEvent nEvent, const void* pEven struct ImplWinData { - o3tl::optional<OUString> + std::optional<OUString> mpExtOldText; std::unique_ptr<ExtTextInputAttr[]> mpExtOldAttrAry; - o3tl::optional<tools::Rectangle> + std::optional<tools::Rectangle> mpCursorRect; long mnCursorExtWidth; bool mbVertical; std::unique_ptr<tools::Rectangle[]> mpCompositionCharRects; long mnCompositionCharRects; - o3tl::optional<tools::Rectangle> + std::optional<tools::Rectangle> mpFocusRect; - o3tl::optional<tools::Rectangle> + std::optional<tools::Rectangle> mpTrackRect; ShowTrackFlags mnTrackFlags; sal_uInt16 mnIsTopWindow; @@ -183,9 +183,9 @@ struct ImplFrameData struct ImplAccessibleInfos { sal_uInt16 nAccessibleRole; - o3tl::optional<OUString> + std::optional<OUString> pAccessibleName; - o3tl::optional<OUString> + std::optional<OUString> pAccessibleDescription; VclPtr<vcl::Window> pLabeledByWindow; VclPtr<vcl::Window> pLabelForWindow; |