dbaccess/source/ui/control/charsetlistbox.cxx | 6 +++---
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 2 +-
dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 2 +-
dbaccess/source/ui/dlg/detailpages.cxx | 2 +-
dbaccess/source/ui/dlg/detailpages.hxx | 2 +-
dbaccess/source/ui/inc/charsetlistbox.hxx | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit e82650dead9e1fe0f87c99495dd8b763a04080c8
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 24 13:36:58 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Oct 25 09:55:43 2018 +0200
rename DBCharSetListBox back to CharSetListBox
Change-Id: I14c8b95ee166b75aa309f701be569f54b57538aa
Reviewed-on: https://gerrit.libreoffice.org/62300
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx
b/dbaccess/source/ui/control/charsetlistbox.cxx
index d2b7d7e3457e..8c2e048692d1 100644
--- a/dbaccess/source/ui/control/charsetlistbox.cxx
+++ b/dbaccess/source/ui/control/charsetlistbox.cxx
@@ -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())
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 61b0324c8682..e950b8b009a8 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -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;
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
index b96a7d811c0e..4d34108e795b 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
@@ -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);
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx
b/dbaccess/source/ui/dlg/detailpages.cxx
index 06f1f57d387a..65d3bccd439a 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -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));
}
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx
b/dbaccess/source/ui/dlg/detailpages.hxx
index d6e990574155..20d0f38fdb87 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -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;
diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx
b/dbaccess/source/ui/inc/charsetlistbox.hxx
index 82633189a8bf..d58c1ca6531a 100644
--- a/dbaccess/source/ui/inc/charsetlistbox.hxx
+++ b/dbaccess/source/ui/inc/charsetlistbox.hxx
@@ -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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
