include/svtools/editbrowsebox.hxx | 6 +++---
include/vcl/weldutils.hxx | 4 ++--
svtools/source/brwbox/ebbcontrols.cxx | 4 ++--
svx/source/fmcomp/gridcell.cxx | 12 ++++++------
vcl/source/app/weldutils.cxx | 22 +++++++++++-----------
5 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit b6b74150955d99af77c07c6c158a815bdff53cca
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Jul 3 11:26:37 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Jul 3 18:10:13 2020 +0200
rename FormattedEntry to EntryFormatter
Change-Id: I96079720f60b789f0b8d5483973150cb050e87e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97859
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/svtools/editbrowsebox.hxx
b/include/svtools/editbrowsebox.hxx
index 260d1a3dd792..fb357d08b1b1 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -575,14 +575,14 @@ namespace svt
virtual void connect_changed(const Link<weld::Entry&, void>& rLink)
override
{
- m_xFormattedEntry->connect_changed(rLink);
+ m_xEntryFormatter->connect_changed(rLink);
}
- weld::FormattedEntry& get_formatter() { return *m_xFormattedEntry; }
+ weld::EntryFormatter& get_formatter() { return *m_xEntryFormatter; }
private:
std::unique_ptr<weld::Entry> m_xEntry;
- std::unique_ptr<weld::FormattedEntry> m_xFormattedEntry;
+ std::unique_ptr<weld::EntryFormatter> m_xEntryFormatter;
};
//= FormattedFieldCellController
diff --git a/include/vcl/weldutils.hxx b/include/vcl/weldutils.hxx
index d9f1ae2c894d..299d3ee3135b 100644
--- a/include/vcl/weldutils.hxx
+++ b/include/vcl/weldutils.hxx
@@ -154,10 +154,10 @@ public:
}
};
-class VCL_DLLPUBLIC FormattedEntry : public Formatter
+class VCL_DLLPUBLIC EntryFormatter : public Formatter
{
public:
- FormattedEntry(weld::Entry& rEntry);
+ EntryFormatter(weld::Entry& rEntry);
void connect_changed(const Link<weld::Entry&, void>& rLink) { m_aModifyHdl
= rLink; }
diff --git a/svtools/source/brwbox/ebbcontrols.cxx
b/svtools/source/brwbox/ebbcontrols.cxx
index 70f7a64b5b6d..46375ff36390 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -384,14 +384,14 @@ namespace svt
FormattedControl::FormattedControl(vcl::Window* pParent)
: EditControlBase(pParent)
, m_xEntry(m_xBuilder->weld_entry("entry"))
- , m_xFormattedEntry(new weld::FormattedEntry(*m_xEntry))
+ , m_xEntryFormatter(new weld::EntryFormatter(*m_xEntry))
{
init(m_xEntry.get());
}
void FormattedControl::dispose()
{
- m_xFormattedEntry.reset();
+ m_xEntryFormatter.reset();
m_xEntry.reset();
EditControlBase::dispose();
}
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 430fd9cbc8e1..f3c5cb22c106 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1252,8 +1252,8 @@ void DbFormattedField::Init( vcl::Window& rParent, const
Reference< XRowSet >& x
auto xEditControl = VclPtr<FormattedControl>::Create(&rParent);
auto xEditPainter = VclPtr<FormattedControl>::Create(&rParent);
- weld::FormattedEntry& rControlFormatter = xEditControl->get_formatter();
- weld::FormattedEntry& rPainterFormatter = xEditPainter->get_formatter();
+ weld::EntryFormatter& rControlFormatter = xEditControl->get_formatter();
+ weld::EntryFormatter& rPainterFormatter = xEditPainter->get_formatter();
m_pWindow = xEditControl.get();
m_pPainter = xEditPainter.get();
@@ -1486,7 +1486,7 @@ OUString DbFormattedField::GetFormatText(const Reference<
css::sdb::XColumn >& _
return OUString();
FormattedControl* pControl =
static_cast<FormattedControl*>(m_pPainter.get());
- weld::FormattedEntry& rPainterFormatter = pControl->get_formatter();
+ weld::EntryFormatter& rPainterFormatter = pControl->get_formatter();
OUString aText;
try
@@ -1531,7 +1531,7 @@ void DbFormattedField::UpdateFromField(const Reference<
css::sdb::XColumn >& _rx
{
FormattedControl* pEditControl =
static_cast<FormattedControl*>(m_pWindow.get());
weld::Entry& rEntry = pEditControl->get_widget();
- weld::FormattedEntry& rEditFormatter = pEditControl->get_formatter();
+ weld::EntryFormatter& rEditFormatter = pEditControl->get_formatter();
if (!_rxField.is())
{
@@ -1573,7 +1573,7 @@ void DbFormattedField::updateFromModel( Reference<
XPropertySet > _rxModel )
FormattedControl* pEditControl =
static_cast<FormattedControl*>(m_pWindow.get());
weld::Entry& rEntry = pEditControl->get_widget();
- weld::FormattedEntry& rEditFormatter = pEditControl->get_formatter();
+ weld::EntryFormatter& rEditFormatter = pEditControl->get_formatter();
OUString sText;
Any aValue = _rxModel->getPropertyValue( FM_PROP_EFFECTIVE_VALUE );
@@ -1597,7 +1597,7 @@ bool DbFormattedField::commitControl()
FormattedControl* pEditControl =
static_cast<FormattedControl*>(m_pWindow.get());
weld::Entry& rEntry = pEditControl->get_widget();
- weld::FormattedEntry& rEditFormatter = pEditControl->get_formatter();
+ weld::EntryFormatter& rEditFormatter = pEditControl->get_formatter();
if (m_rColumn.IsNumeric())
{
diff --git a/vcl/source/app/weldutils.cxx b/vcl/source/app/weldutils.cxx
index 32fd74642563..d9d237cef5c4 100644
--- a/vcl/source/app/weldutils.cxx
+++ b/vcl/source/app/weldutils.cxx
@@ -125,24 +125,24 @@ void RemoveParentKeepChildren(weld::TreeView& rTreeView,
weld::TreeIter& rParent
rTreeView.remove(rParent);
}
-FormattedEntry::FormattedEntry(weld::Entry& rEntry)
+EntryFormatter::EntryFormatter(weld::Entry& rEntry)
: m_rEntry(rEntry)
,
m_eOptions(Application::GetSettings().GetStyleSettings().GetSelectionOptions())
{
- m_rEntry.connect_changed(LINK(this, FormattedEntry, ModifyHdl));
- m_rEntry.connect_focus_out(LINK(this, FormattedEntry, FocusOutHdl));
+ m_rEntry.connect_changed(LINK(this, EntryFormatter, ModifyHdl));
+ m_rEntry.connect_focus_out(LINK(this, EntryFormatter, FocusOutHdl));
}
-Selection FormattedEntry::GetEntrySelection() const
+Selection EntryFormatter::GetEntrySelection() const
{
int nStartPos, nEndPos;
m_rEntry.get_selection_bounds(nStartPos, nEndPos);
return Selection(nStartPos, nEndPos);
}
-OUString FormattedEntry::GetEntryText() const { return m_rEntry.get_text(); }
+OUString EntryFormatter::GetEntryText() const { return m_rEntry.get_text(); }
-void FormattedEntry::SetEntryText(const OUString& rText, const Selection& rSel)
+void EntryFormatter::SetEntryText(const OUString& rText, const Selection& rSel)
{
m_rEntry.set_text(rText);
auto nMin = rSel.Min();
@@ -150,18 +150,18 @@ void FormattedEntry::SetEntryText(const OUString& rText,
const Selection& rSel)
m_rEntry.select_region(nMin < 0 ? 0 : nMin, nMax == SELECTION_MAX ? -1 :
nMax);
}
-void FormattedEntry::SetEntryTextColor(const Color* pColor)
+void EntryFormatter::SetEntryTextColor(const Color* pColor)
{
m_rEntry.set_font_color(pColor ? *pColor : COL_AUTO);
}
-SelectionOptions FormattedEntry::GetEntrySelectionOptions() const { return
m_eOptions; }
+SelectionOptions EntryFormatter::GetEntrySelectionOptions() const { return
m_eOptions; }
-void FormattedEntry::FieldModified() { m_aModifyHdl.Call(m_rEntry); }
+void EntryFormatter::FieldModified() { m_aModifyHdl.Call(m_rEntry); }
-IMPL_LINK_NOARG(FormattedEntry, ModifyHdl, weld::Entry&, void) { Modify(); }
+IMPL_LINK_NOARG(EntryFormatter, ModifyHdl, weld::Entry&, void) { Modify(); }
-IMPL_LINK_NOARG(FormattedEntry, FocusOutHdl, weld::Widget&, void) {
EntryLostFocus(); }
+IMPL_LINK_NOARG(EntryFormatter, FocusOutHdl, weld::Widget&, void) {
EntryLostFocus(); }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
