diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-03-03 14:03:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-03-11 14:30:23 +0100 |
| commit | 5649c4b26401b56736b9eb56ef47b73b95e43c67 (patch) | |
| tree | a1cb5b84f4a502042df74f638eb0fe8f35a88cee /include/sfx2/sidebar | |
| parent | d764415977ad65bb4a657ccada7c9b2c19b689e1 (diff) | |
create GetElementParentWindow on demand
Change-Id: I5c7182986206483ab8b1993a360767425870d69e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111940
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/sfx2/sidebar')
| -rw-r--r-- | include/sfx2/sidebar/Panel.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/sidebar/SidebarController.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx index cd820ff937b2..92e57abc13fd 100644 --- a/include/sfx2/sidebar/Panel.hxx +++ b/include/sfx2/sidebar/Panel.hxx @@ -70,7 +70,7 @@ public: { return mxPanelComponent; } - css::uno::Reference<css::awt::XWindow> GetElementParentWindow() const { return mxXWindow; } + css::uno::Reference<css::awt::XWindow> GetElementParentWindow(); css::uno::Reference<css::awt::XWindow> GetElementWindow(); void SetExpanded(const bool bIsExpanded); bool IsExpanded() const { return mbIsExpanded; } @@ -98,7 +98,7 @@ private: const css::uno::Reference<css::frame::XFrame>& mxFrame; std::unique_ptr<PanelTitleBar> mxTitleBar; std::unique_ptr<weld::Container> mxContents; - css::uno::Reference<css::awt::XWindow> mxXWindow; + css::uno::Reference<css::awt::XWindow> mxAwtXWindow; }; typedef std::vector<VclPtr<Panel>> SharedPanelContainer; diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index 1c38211d11c1..8bcaa858ff1c 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -39,7 +39,7 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -namespace com::sun::star::awt { class XWindowPeer; } +namespace com::sun::star::awt { class XWindow; } namespace com::sun::star::frame { class XDispatch; } namespace com::sun::star::ui { class XUIElement; } @@ -231,7 +231,7 @@ private: void UpdateConfigurations(); css::uno::Reference<css::ui::XUIElement> CreateUIElement ( - const css::uno::Reference<css::awt::XWindowPeer>& rxWindow, + const css::uno::Reference<css::awt::XWindow>& rxWindow, const OUString& rsImplementationURL, const bool bWantsCanvas, const Context& rContext); |