diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-17 21:21:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-19 16:54:33 +0100 |
| commit | 837ba68ac04ed52716eef531f034b6a49f576178 (patch) | |
| tree | 0b0188a7280d7722cb29f72d9b10f519ccfc13ad /include/vcl/builder.hxx | |
| parent | 82a213880ff3927d8b2b3e5135743002a3b4df35 (diff) | |
weld: hook up help response
and keep the current legacy ownership behaviour when welding the
legacy backend
Change-Id: I7e1f90f2d235abf0e10062b4be11ba5150bbdbfb
Reviewed-on: https://gerrit.libreoffice.org/49918
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/vcl/builder.hxx')
| -rw-r--r-- | include/vcl/builder.hxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 68d29903b8c0..d9d500051116 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -34,9 +34,11 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +class Button; class ListBox; class NumericFormatter; class PopupMenu; +class SalInstanceBuilder; class ScrollBar; class Slider; class DateField; @@ -59,7 +61,8 @@ public: const OUString& sUIRootDir, const OUString& sUIFile, const OString& sID = OString(), - const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); + const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>(), + bool bLegacy = true); ~VclBuilder(); ///releases references and disposes all children. @@ -289,6 +292,7 @@ private: bool m_bToplevelHasDeferredInit; bool m_bToplevelHasDeferredProperties; bool m_bToplevelParentFound; + bool m_bLegacy; std::unique_ptr<ParserState> m_pParserState; vcl::Window *get_by_name(const OString& sID); @@ -309,6 +313,7 @@ private: /// XFrame to be able to extract labels and other properties of the UNO commands (like of .uno:Bold). css::uno::Reference<css::frame::XFrame> m_xFrame; + DECL_LINK(ResponseHdl, ::Button*, void); private: VclPtr<vcl::Window> insertObject(vcl::Window *pParent, const OString &rClass, const OString &rID, @@ -478,6 +483,8 @@ public: protected: std::unique_ptr<VclBuilder> m_pUIBuilder; + + friend class ::SalInstanceBuilder; }; /* |