sw/source/ui/fldui/changedb.cxx | 2 +-
sw/source/ui/fldui/flddb.cxx | 2 +-
sw/source/ui/fldui/flddb.hxx | 2 +-
sw/source/uibase/dbui/dbtree.cxx | 20 ++++++++++----------
sw/source/uibase/inc/changedb.hxx | 2 +-
sw/source/uibase/inc/dbtree.hxx | 6 +++---
6 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 94369103fa61beae1ac9baad8066f31f8fa736da
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Mar 19 09:38:33 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Mar 19 13:43:48 2019 +0100
rename DBTreeList back to SwDBTreeList
Change-Id: Ia5880f81aac7df1766ce306d175f80f64920b4d7
Reviewed-on: https://gerrit.libreoffice.org/69409
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 3db42d25f5f3..32b64af27dcf 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -54,7 +54,7 @@ SwChangeDBDlg::SwChangeDBDlg(SwView const & rVw)
"ExchangeDatabasesDialog")
, pSh(rVw.GetWrtShellPtr())
, m_xUsedDBTLB(m_xBuilder->weld_tree_view("inuselb"))
- , m_xAvailDBTLB(new DBTreeList(m_xBuilder->weld_tree_view("availablelb")))
+ , m_xAvailDBTLB(new
SwDBTreeList(m_xBuilder->weld_tree_view("availablelb")))
, m_xAddDBPB(m_xBuilder->weld_button("browse"))
, m_xDocDBNameFT(m_xBuilder->weld_label("dbnameft"))
, m_xDefineBT(m_xBuilder->weld_button("ok"))
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 0f0aab017bf8..d322e4658e20 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -38,7 +38,7 @@ SwFieldDBPage::SwFieldDBPage(TabPageParent pParent, const
SfxItemSet *const pCor
, m_nOldFormat(0)
, m_nOldSubType(0)
, m_xTypeLB(m_xBuilder->weld_tree_view("type"))
- , m_xDatabaseTLB(new DBTreeList(m_xBuilder->weld_tree_view("select")))
+ , m_xDatabaseTLB(new SwDBTreeList(m_xBuilder->weld_tree_view("select")))
, m_xAddDBPB(m_xBuilder->weld_button("browse"))
, m_xCondition(m_xBuilder->weld_widget("condgroup"))
, m_xConditionED(new SwConditionEdit(m_xBuilder->weld_entry("condition")))
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 913788cba606..f82d8dfc2b7c 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -38,7 +38,7 @@ class SwFieldDBPage : public SwFieldPage
sal_uInt16 m_nOldSubType;
std::unique_ptr<weld::TreeView> m_xTypeLB;
- std::unique_ptr<DBTreeList> m_xDatabaseTLB;
+ std::unique_ptr<SwDBTreeList> m_xDatabaseTLB;
std::unique_ptr<weld::Button> m_xAddDBPB;
std::unique_ptr<weld::Widget> m_xCondition;
std::unique_ptr<SwConditionEdit> m_xConditionED;
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index fce39c1b02b4..444ba7b54ec9 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -133,20 +133,20 @@ Reference<XConnection>
SwDBTreeList_Impl::GetConnection(const OUString& rSource
return xRet;
}
-DBTreeList::DBTreeList(std::unique_ptr<weld::TreeView> xTreeView)
+SwDBTreeList::SwDBTreeList(std::unique_ptr<weld::TreeView> xTreeView)
: bInitialized(false)
, bShowColumns(false)
, pImpl(new SwDBTreeList_Impl)
, m_xTreeView(std::move(xTreeView))
{
- m_xTreeView->connect_expanding(LINK(this, DBTreeList,
RequestingChildrenHdl));
+ m_xTreeView->connect_expanding(LINK(this, SwDBTreeList,
RequestingChildrenHdl));
}
-DBTreeList::~DBTreeList()
+SwDBTreeList::~SwDBTreeList()
{
}
-void DBTreeList::InitTreeList()
+void SwDBTreeList::InitTreeList()
{
if (!pImpl->HasContext() && pImpl->GetWrtShell())
return;
@@ -177,7 +177,7 @@ void DBTreeList::InitTreeList()
bInitialized = true;
}
-void DBTreeList::AddDataSource(const OUString& rSource)
+void SwDBTreeList::AddDataSource(const OUString& rSource)
{
OUString aImg(RID_BMP_DB);
std::unique_ptr<weld::TreeIter> xIter(m_xTreeView->make_iterator());
@@ -185,7 +185,7 @@ void DBTreeList::AddDataSource(const OUString& rSource)
m_xTreeView->select(*xIter);
}
-IMPL_LINK(DBTreeList, RequestingChildrenHdl, const weld::TreeIter&, rParent,
bool)
+IMPL_LINK(SwDBTreeList, RequestingChildrenHdl, const weld::TreeIter&, rParent,
bool)
{
if (!m_xTreeView->iter_has_child(rParent))
{
@@ -314,7 +314,7 @@ IMPL_LINK(DBTreeList, RequestingChildrenHdl, const
weld::TreeIter&, rParent, boo
return true;
}
-OUString DBTreeList::GetDBName(OUString& rTableName, OUString& rColumnName,
sal_Bool* pbIsTable)
+OUString SwDBTreeList::GetDBName(OUString& rTableName, OUString& rColumnName,
sal_Bool* pbIsTable)
{
OUString sDBName;
std::unique_ptr<weld::TreeIter> xIter(m_xTreeView->make_iterator());
@@ -337,7 +337,7 @@ OUString DBTreeList::GetDBName(OUString& rTableName,
OUString& rColumnName, sal_
}
// Format: database.table
-void DBTreeList::Select(const OUString& rDBName, const OUString& rTableName,
const OUString& rColumnName)
+void SwDBTreeList::Select(const OUString& rDBName, const OUString& rTableName,
const OUString& rColumnName)
{
std::unique_ptr<weld::TreeIter> xParent(m_xTreeView->make_iterator());
if (!m_xTreeView->get_iter_first(*xParent))
@@ -392,7 +392,7 @@ void DBTreeList::Select(const OUString& rDBName, const
OUString& rTableName, con
} while (m_xTreeView->iter_next_sibling(*xParent));
}
-void DBTreeList::SetWrtShell(SwWrtShell& rSh)
+void SwDBTreeList::SetWrtShell(SwWrtShell& rSh)
{
pImpl->SetWrtShell(rSh);
if (m_xTreeView->get_visible() && !bInitialized)
@@ -408,7 +408,7 @@ namespace
}
}
-void DBTreeList::ShowColumns(bool bShowCol)
+void SwDBTreeList::ShowColumns(bool bShowCol)
{
if (bShowCol != bShowColumns)
{
diff --git a/sw/source/uibase/inc/changedb.hxx
b/sw/source/uibase/inc/changedb.hxx
index 9beae0bb1a76..ab41d4121573 100644
--- a/sw/source/uibase/inc/changedb.hxx
+++ b/sw/source/uibase/inc/changedb.hxx
@@ -34,7 +34,7 @@ class SwChangeDBDlg : public SfxDialogController
SwWrtShell *pSh;
std::unique_ptr<weld::TreeView> m_xUsedDBTLB;
- std::unique_ptr<DBTreeList> m_xAvailDBTLB;
+ std::unique_ptr<SwDBTreeList> m_xAvailDBTLB;
std::unique_ptr<weld::Button> m_xAddDBPB;
std::unique_ptr<weld::Label> m_xDocDBNameFT;
std::unique_ptr<weld::Button> m_xDefineBT;
diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx
index bf729c86f597..5d34ddbb77c5 100644
--- a/sw/source/uibase/inc/dbtree.hxx
+++ b/sw/source/uibase/inc/dbtree.hxx
@@ -29,7 +29,7 @@
class SwDBTreeList_Impl;
class SwWrtShell;
-class SW_DLLPUBLIC DBTreeList
+class SW_DLLPUBLIC SwDBTreeList
{
bool bInitialized;
bool bShowColumns;
@@ -41,8 +41,8 @@ class SW_DLLPUBLIC DBTreeList
SAL_DLLPRIVATE void InitTreeList();
public:
- DBTreeList(std::unique_ptr<weld::TreeView> xTreeView);
- ~DBTreeList();
+ SwDBTreeList(std::unique_ptr<weld::TreeView> xTreeView);
+ ~SwDBTreeList();
OUString GetDBName(OUString& rTableName, OUString& rColumnName, sal_Bool*
pbIsTable = nullptr);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
