diff options
Diffstat (limited to 'dbaccess/source/ui/inc/SqlNameEdit.hxx')
-rw-r--r-- | dbaccess/source/ui/inc/SqlNameEdit.hxx | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index 7a6e43c15b32..14d845b4b17c 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -16,10 +16,10 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_SQLNAMEEDIT_HXX -#define INCLUDED_DBACCESS_SOURCE_UI_INC_SQLNAMEEDIT_HXX +#pragma once -#include <vcl/edit.hxx> +#include <svtools/editbrowsebox.hxx> +#include <utility> #include <vcl/weld.hxx> namespace dbaui @@ -29,8 +29,8 @@ namespace dbaui OUString m_sAllowedChars; bool m_bCheck; // true when we should check for invalid chars public: - OSQLNameChecker(const OUString& _rAllowedChars) - :m_sAllowedChars(_rAllowedChars) + OSQLNameChecker(OUString _sAllowedChars) + :m_sAllowedChars(std::move(_sAllowedChars)) ,m_bCheck(true) { } @@ -43,21 +43,29 @@ namespace dbaui { m_bCheck = _bCheck; } - bool checkString(const OUString& _sToCheck,OUString& _rsCorrected); + bool checkString(std::u16string_view _sToCheck,OUString& _rsCorrected); }; - class OSQLNameEdit : public Edit - ,public OSQLNameChecker + class OSQLNameEditControl : public svt::EditControl + , public OSQLNameChecker { public: - OSQLNameEdit(vcl::Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString()) - : Edit(_pParent,nStyle) - , OSQLNameChecker(_rAllowedChars) + OSQLNameEditControl(BrowserDataWin* pParent, const OUString& rAllowedChars) + : svt::EditControl(pParent) + , OSQLNameChecker(rAllowedChars) + { + m_xWidget->connect_changed(LINK(this, OSQLNameEditControl, ModifyHdl)); + } + + virtual void connect_changed(const Link<weld::Entry&, void>& rLink) override { + m_ChainChangedHdl = rLink; } - // Edit overrides - virtual void Modify() override; + private: + DECL_LINK(ModifyHdl, weld::Entry&, void); + + Link<weld::Entry&,void> m_ChainChangedHdl; }; class OWidgetBase @@ -102,7 +110,6 @@ namespace dbaui OUString get_text() const { return m_xEntry->get_text(); } void set_text(const OUString& rText) { m_xEntry->set_text(rText); } void set_max_length(int nLen) { m_xEntry->set_max_length(nLen); } - void set_sensitive(bool bSensitive) { m_xEntry->set_sensitive(bSensitive); } virtual void save_value() override { m_xEntry->save_value(); } virtual bool get_value_changed_from_saved() const override { @@ -111,6 +118,5 @@ namespace dbaui }; } -#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_SQLNAMEEDIT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |