diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2020-07-02 11:01:54 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-07-02 12:09:21 +0200 |
| commit | b017893371d1f92eda6020728494eebca7626a69 (patch) | |
| tree | 7acffebbff3ca88480ac34210d449cd6c0b6716a /include | |
| parent | 1600dd7929d18b6d234bdb975798882ef73722a7 (diff) | |
jsdialog: move executor code to vcl
Change-Id: I9247a652707fe3239dc488a605a2c506d8eec95c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97736
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/jsdialog/executor.hxx (renamed from include/vcl/jsdialog/builder.hxx) | 4 | ||||
| -rw-r--r-- | include/vcl/weld.hxx | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/include/vcl/jsdialog/builder.hxx b/include/vcl/jsdialog/executor.hxx index b054b1d00a08..9cc4471551ba 100644 --- a/include/vcl/jsdialog/builder.hxx +++ b/include/vcl/jsdialog/executor.hxx @@ -10,12 +10,12 @@ #pragma once #include <vcl/dllapi.h> -#include <vcl/IDialogRenderable.hxx> +#include <vcl/uitest/uiobject.hxx> #include <vcl/weld.hxx> namespace jsdialog { -VCL_DLLPUBLIC weld::Widget* FindWeldWidgetsMap(sal_uInt64 nWindowId, const OString& rWidget); +VCL_DLLPUBLIC bool ExecuteAction(sal_uInt64 nWindowId, const OString& rWidget, StringMap& rData); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index d5fd850fdcc4..abe893bdf03a 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -10,6 +10,7 @@ #ifndef INCLUDED_VCL_WELD_HXX #define INCLUDED_VCL_WELD_HXX +#include <vcl/jsdialog/executor.hxx> #include <basegfx/range/b2irange.hxx> #include <rtl/ustring.hxx> #include <tools/color.hxx> @@ -562,6 +563,9 @@ enum class EntryMessageType /// A widget used to choose from a list of items. class VCL_DLLPUBLIC ComboBox : virtual public Container { + friend VCL_DLLPUBLIC bool jsdialog::ExecuteAction(sal_uInt64 nWindowId, const OString& rWidget, + StringMap& rData); + private: OUString m_sSavedValue; @@ -571,10 +575,10 @@ protected: Link<ComboBox&, bool> m_aEntryActivateHdl; Link<OUString&, bool> m_aEntryInsertTextHdl; -public: void signal_changed() { m_aChangeHdl.Call(*this); } virtual void signal_popup_toggled() { m_aPopupToggledHdl.Call(*this); } +public: virtual void insert(int pos, const OUString& rStr, const OUString* pId, const OUString* pIconName, VirtualDevice* pImageSurface) = 0; @@ -1242,6 +1246,9 @@ public: class VCL_DLLPUBLIC Entry : virtual public Widget { + friend VCL_DLLPUBLIC bool jsdialog::ExecuteAction(sal_uInt64 nWindowId, const OString& rWidget, + StringMap& rData); + private: OUString m_sSavedValue; @@ -1251,12 +1258,11 @@ protected: Link<Entry&, void> m_aCursorPositionHdl; Link<Entry&, bool> m_aActivateHdl; + void signal_changed() { m_aChangeHdl.Call(*this); } void signal_cursor_position() { m_aCursorPositionHdl.Call(*this); } void signal_insert_text(OUString& rString); public: - void signal_changed() { m_aChangeHdl.Call(*this); } - virtual void set_text(const OUString& rText) = 0; virtual OUString get_text() const = 0; virtual void set_width_chars(int nChars) = 0; |