diff options
author | Szymon Kłos <szymon.klos@collabora.com> | 2020-07-02 09:30:51 +0200 |
---|---|---|
committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-07-02 11:04:50 +0200 |
commit | 1600dd7929d18b6d234bdb975798882ef73722a7 (patch) | |
tree | 65fea2ba54d709759d84b91bfb7a35730a3825a5 /include | |
parent | 3bff52cae392cf7e45729a3469333b0e76b3d874 (diff) |
Revert "weld SvxFontSizeBox_Impl"
This reverts commit f3ad8a70c3c15fd57891b0d2fe0bb0a5d2aa39a2.
Change caused font size combbobx to not work on mobile
devices in online.
Change-Id: I41fc370866689b047aeeec056dff708e24dbc11f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97722
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/svtools/ctrlbox.hxx | 11 | ||||
-rw-r--r-- | include/vcl/combobox.hxx | 3 | ||||
-rw-r--r-- | include/vcl/salvtables.hxx | 6 | ||||
-rw-r--r-- | include/vcl/weld.hxx | 14 |
4 files changed, 0 insertions, 34 deletions
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index bd762e51bbc7..a02484d005aa 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -439,7 +439,6 @@ class SVT_DLLPUBLIC SvtFontSizeBox bPtRelative:1, bStdSize:1; Link<weld::ComboBox&, void> m_aChangeHdl; - Link<weld::Widget&, void> m_aFocusOutHdl; std::unique_ptr<weld::ComboBox> m_xComboBox; sal_uInt16 GetDecimalDigits() const { return nDecimalDigits; } @@ -473,24 +472,14 @@ public: bool IsPtRelative() const { return bPtRelative; } void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_aChangeHdl = rLink; } - void connect_focus_out(const Link<weld::Widget&, void>& rLink) { m_aFocusOutHdl = rLink; } - void connect_key_press(const Link<const KeyEvent&, bool>& rLink) { m_xComboBox->connect_key_press(rLink); } OUString get_active_text() const { return m_xComboBox->get_active_text(); } void set_active_text(const OUString& rText) { m_xComboBox->set_active_text(rText); } void set_sensitive(bool bSensitive) { m_xComboBox->set_sensitive(bSensitive); } - int get_active() const { return m_xComboBox->get_active(); } int get_value() const; void set_value(int nValue); void save_value() { nSavedValue = get_value(); } int get_saved_value() const { return nSavedValue; } bool get_value_changed_from_saved() const { return get_value() != get_saved_value(); } - int get_count() const { return m_xComboBox->get_count(); } - OUString get_text(int i) const { return m_xComboBox->get_text(i); } - void grab_focus() { m_xComboBox->grab_focus(); } - bool has_focus() const { return m_xComboBox->has_focus(); } - void connect_entry_activate(const Link<weld::ComboBox&, bool>& rLink) { m_xComboBox->connect_entry_activate(rLink); } - void disable_entry_completion() { m_xComboBox->set_entry_completion(false, false); } - boost::property_tree::ptree get_property_tree() const; private: SvtFontSizeBox(const SvtFontSizeBox&) = delete; diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 83f8beef71e9..5484023778c7 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -153,9 +153,6 @@ public: void SetNoSelection(); tools::Rectangle GetBoundingRectangle( sal_Int32 nItem ) const; - // determine if Select was called due to something selected from the menu - bool IsModifyByMenu() const; - /** checks whether a certain point lies within the bounds of a list item and returns the item as well as the character position the point is at. diff --git a/include/vcl/salvtables.hxx b/include/vcl/salvtables.hxx index 6eb89c1a72d4..31ba8c564eb8 100644 --- a/include/vcl/salvtables.hxx +++ b/include/vcl/salvtables.hxx @@ -341,8 +341,6 @@ public: virtual css::uno::Reference<css::datatransfer::dnd::XDropTarget> get_drop_target() override; - virtual boost::property_tree::ptree get_property_tree() const override; - virtual void set_stack_background() override; virtual void set_highlight_background() override; @@ -783,8 +781,6 @@ public: virtual bool has_entry() const override; - virtual bool changed_by_menu() const override; - virtual void set_entry_message_type(weld::EntryMessageType /*eType*/) override; virtual void set_entry_text(const OUString& /*rText*/) override; @@ -826,8 +822,6 @@ public: virtual void insert_separator(int pos, const OUString& /*rId*/) override; - virtual bool changed_by_menu() const override; - virtual void set_entry_text(const OUString& rText) override; virtual void set_entry_width_chars(int nChars) override; diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 4dfbeb9317bc..d5fd850fdcc4 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -27,8 +27,6 @@ #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> -#include <boost/property_tree/ptree_fwd.hpp> - #include <assert.h> #include <memory> #include <vector> @@ -250,8 +248,6 @@ public: virtual css::uno::Reference<css::datatransfer::dnd::XDropTarget> get_drop_target() = 0; - virtual boost::property_tree::ptree get_property_tree() const = 0; - virtual ~Widget() {} }; @@ -628,17 +624,7 @@ public: virtual int find_id(const OUString& rId) const = 0; void remove_id(const OUString& rId) { remove(find_id(rId)); } - /* m_aChangeHdl is called when the active item is changed. The can be due - to the user selecting a different item from the list or while typing - into the entry of a combo box with an entry. - - Use changed_by_menu() to discover whether an item was actually selected - from the menu. - */ void connect_changed(const Link<ComboBox&, void>& rLink) { m_aChangeHdl = rLink; } - - virtual bool changed_by_menu() const = 0; - virtual void connect_popup_toggled(const Link<ComboBox&, void>& rLink) { m_aPopupToggledHdl = rLink; |