Kaydet (Commit) e82650de authored tarafından Caolán McNamara's avatar Caolán McNamara

rename DBCharSetListBox back to CharSetListBox

Change-Id: I14c8b95ee166b75aa309f701be569f54b57538aa
Reviewed-on: https://gerrit.libreoffice.org/62300Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 55078d3e
......@@ -26,7 +26,7 @@
namespace dbaui
{
DBCharSetListBox::DBCharSetListBox(std::unique_ptr<weld::ComboBox> xControl)
CharSetListBox::CharSetListBox(std::unique_ptr<weld::ComboBox> xControl)
: m_xControl(std::move(xControl))
{
for (auto const& charset : m_aCharSets)
......@@ -35,7 +35,7 @@ namespace dbaui
}
}
void DBCharSetListBox::SelectEntryByIanaName( const OUString& _rIanaName )
void CharSetListBox::SelectEntryByIanaName( const OUString& _rIanaName )
{
OCharsetDisplay::const_iterator aFind = m_aCharSets.findIanaName( _rIanaName );
if (aFind == m_aCharSets.end())
......@@ -50,7 +50,7 @@ namespace dbaui
m_xControl->set_active_text((*aFind).getDisplayName());
}
bool DBCharSetListBox::StoreSelectedCharSet( SfxItemSet& _rSet, const sal_uInt16 _nItemId )
bool CharSetListBox::StoreSelectedCharSet( SfxItemSet& _rSet, const sal_uInt16 _nItemId )
{
bool bChangedSomething = false;
if (m_xControl->get_value_changed_from_saved())
......
......@@ -78,7 +78,7 @@ namespace dbaui
, m_xRowHeader(m_xBuilder->weld_check_button("containsheaders"))
, m_xCharSetHeader(m_xBuilder->weld_widget("charsetframe"))
, m_xCharSetLabel(m_xBuilder->weld_label("charsetlabel"))
, m_xCharSet(new DBCharSetListBox(m_xBuilder->weld_combo_box("charset")))
, m_xCharSet(new CharSetListBox(m_xBuilder->weld_combo_box("charset")))
{
sal_Int32 nCnt = comphelper::string::getTokenCount(m_aFieldSeparatorList, '\t');
sal_Int32 i;
......
......@@ -73,7 +73,7 @@ namespace dbaui
std::unique_ptr<weld::CheckButton> m_xRowHeader;
std::unique_ptr<weld::Widget> m_xCharSetHeader;
std::unique_ptr<weld::Label> m_xCharSetLabel;
std::unique_ptr<DBCharSetListBox> m_xCharSet;
std::unique_ptr<CharSetListBox> m_xCharSet;
DECL_LINK(OnSetExtensionHdl, weld::ToggleButton&, void);
DECL_LINK(OnEditModified, weld::Entry&, void);
......
......@@ -75,7 +75,7 @@ namespace dbaui
m_xDataConvertLabel->show();
m_xCharsetLabel = m_xBuilder->weld_label("charsetlabel");
m_xCharsetLabel->show();
m_xCharset.reset(new DBCharSetListBox(m_xBuilder->weld_combo_box("charset")));
m_xCharset.reset(new CharSetListBox(m_xBuilder->weld_combo_box("charset")));
m_xCharset->show();
m_xCharset->connect_changed(LINK(this, OCommonBehaviourTabPage, CharsetSelectHdl));
}
......
......@@ -62,7 +62,7 @@ namespace dbaui
std::unique_ptr<weld::Label> m_xDataConvertLabel;
std::unique_ptr<weld::Label> m_xCharsetLabel;
std::unique_ptr<DBCharSetListBox> m_xCharset;
std::unique_ptr<CharSetListBox> m_xCharset;
std::unique_ptr<weld::CheckButton> m_xAutoRetrievingEnabled;
std::unique_ptr<weld::Label> m_xAutoIncrementLabel;
......
......@@ -28,10 +28,10 @@ class SfxItemSet;
namespace dbaui
{
// CharSetListBox
class DBCharSetListBox
class CharSetListBox
{
public:
DBCharSetListBox(std::unique_ptr<weld::ComboBox> xControl);
CharSetListBox(std::unique_ptr<weld::ComboBox> xControl);
void SelectEntryByIanaName( const OUString& _rIanaName );
bool StoreSelectedCharSet( SfxItemSet& _rSet, const sal_uInt16 _nItemId );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment