[Libreoffice-commits] core.git: sc/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Fri Apr 12 15:43:27 UTC 2019
sc/source/ui/inc/namedlg.hxx | 2 +-
sc/source/ui/inc/namemgrtable.hxx | 4 ++--
sc/source/ui/inc/namepast.hxx | 2 +-
sc/source/ui/namedlg/namedlg.cxx | 2 +-
sc/source/ui/namedlg/namemgrtable.cxx | 30 +++++++++++++++---------------
sc/source/ui/namedlg/namepast.cxx | 2 +-
6 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 9769288a83ba038e8dbbb16261436a1cd53b37a1
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Apr 12 14:00:33 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Apr 12 17:42:22 2019 +0200
rename ScRangeManagerTable back to RangeManagerTable
Change-Id: Ie9dec478c38c484d47720e488427d797269f228f
Reviewed-on: https://gerrit.libreoffice.org/70664
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 2034cd26e918..dd87ede4acdf 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -75,7 +75,7 @@ private:
std::unique_ptr<weld::Expander> m_xExpander;
- std::unique_ptr<RangeManagerTable> m_xRangeManagerTable;
+ std::unique_ptr<ScRangeManagerTable> m_xRangeManagerTable;
private:
void Init();
diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx
index 7d46b7e005be..e3a98a3a0f39 100644
--- a/sc/source/ui/inc/namemgrtable.hxx
+++ b/sc/source/ui/inc/namemgrtable.hxx
@@ -29,7 +29,7 @@ struct ScRangeNameLine
OUString aScope;
};
-class SC_DLLPUBLIC RangeManagerTable
+class SC_DLLPUBLIC ScRangeManagerTable
{
private:
std::unique_ptr<weld::TreeView> m_xTreeView;
@@ -54,7 +54,7 @@ private:
DECL_LINK(VisRowsScrolledHdl, weld::TreeView&, void);
public:
- RangeManagerTable(std::unique_ptr<weld::TreeView>,
+ ScRangeManagerTable(std::unique_ptr<weld::TreeView>,
const std::map<OUString, std::unique_ptr<ScRangeName>>& rTabRangeNames,
const ScAddress& rPos);
diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx
index 8cec55594351..67a4776eef6a 100644
--- a/sc/source/ui/inc/namepast.hxx
+++ b/sc/source/ui/inc/namepast.hxx
@@ -37,7 +37,7 @@ private:
std::unique_ptr<weld::Button> m_xBtnPasteAll;
std::unique_ptr<weld::Button> m_xBtnPaste;
std::unique_ptr<weld::Button> m_xBtnClose;
- std::unique_ptr<RangeManagerTable> m_xTable;
+ std::unique_ptr<ScRangeManagerTable> m_xTable;
std::vector<OUString> maSelectedNames;
std::map<OUString, std::unique_ptr<ScRangeName>> m_RangeMap;
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 1ad1bf3a67b0..352e1387441e 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -109,7 +109,7 @@ void ScNameDlg::Init()
std::unique_ptr<weld::TreeView> xTreeView(m_xBuilder->weld_tree_view("names"));
xTreeView->set_size_request(xTreeView->get_approximate_digit_width() * 75,
xTreeView->get_height_rows(10));
- m_xRangeManagerTable.reset(new RangeManagerTable(std::move(xTreeView), m_RangeMap, maCursorPos));
+ m_xRangeManagerTable.reset(new ScRangeManagerTable(std::move(xTreeView), m_RangeMap, maCursorPos));
if (m_xRangeManagerTable->n_children())
{
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index 35311d853523..b1ccc458e5b5 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -22,14 +22,14 @@
#include <vcl/layout.hxx>
#include <tools/link.hxx>
-void RangeManagerTable::GetCurrentLine(ScRangeNameLine& rLine)
+void ScRangeManagerTable::GetCurrentLine(ScRangeNameLine& rLine)
{
std::unique_ptr<weld::TreeIter> xCurrentEntry(m_xTreeView->make_iterator());
if (m_xTreeView->get_cursor(xCurrentEntry.get()))
GetLine(rLine, *xCurrentEntry);
}
-void RangeManagerTable::DeleteSelectedEntries()
+void ScRangeManagerTable::DeleteSelectedEntries()
{
std::vector<int> aRows = m_xTreeView->get_selected_rows();
std::sort(aRows.begin(), aRows.end());
@@ -37,12 +37,12 @@ void RangeManagerTable::DeleteSelectedEntries()
m_xTreeView->remove(*it);
}
-bool RangeManagerTable::IsMultiSelection()
+bool ScRangeManagerTable::IsMultiSelection()
{
return m_xTreeView->count_selected_rows() > 1;
}
-void RangeManagerTable::SetEntry(const ScRangeNameLine& rLine)
+void ScRangeManagerTable::SetEntry(const ScRangeNameLine& rLine)
{
for (int i = 0, nEntryCount = m_xTreeView->n_children(); i < nEntryCount; ++i)
{
@@ -54,7 +54,7 @@ void RangeManagerTable::SetEntry(const ScRangeNameLine& rLine)
}
}
-RangeManagerTable::RangeManagerTable(std::unique_ptr<weld::TreeView> xTreeView,
+ScRangeManagerTable::ScRangeManagerTable(std::unique_ptr<weld::TreeView> xTreeView,
const std::map<OUString, std::unique_ptr<ScRangeName>>& rRangeMap,
const ScAddress& rPos)
: m_xTreeView(std::move(xTreeView))
@@ -71,16 +71,16 @@ RangeManagerTable::RangeManagerTable(std::unique_ptr<weld::TreeView> xTreeView,
Init();
m_xTreeView->set_selection_mode(SelectionMode::Multiple);
- m_xTreeView->connect_size_allocate(LINK(this, RangeManagerTable, SizeAllocHdl));
- m_xTreeView->connect_visible_range_changed(LINK(this, RangeManagerTable, VisRowsScrolledHdl));
+ m_xTreeView->connect_size_allocate(LINK(this, ScRangeManagerTable, SizeAllocHdl));
+ m_xTreeView->connect_visible_range_changed(LINK(this, ScRangeManagerTable, VisRowsScrolledHdl));
}
-IMPL_LINK_NOARG(RangeManagerTable, VisRowsScrolledHdl, weld::TreeView&, void)
+IMPL_LINK_NOARG(ScRangeManagerTable, VisRowsScrolledHdl, weld::TreeView&, void)
{
CheckForFormulaString();
}
-const ScRangeData* RangeManagerTable::findRangeData(const ScRangeNameLine& rLine)
+const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine& rLine)
{
const ScRangeName* pRangeName;
if (rLine.aScope == maGlobalString)
@@ -91,7 +91,7 @@ const ScRangeData* RangeManagerTable::findRangeData(const ScRangeNameLine& rLine
return pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(rLine.aName));
}
-void RangeManagerTable::CheckForFormulaString()
+void ScRangeManagerTable::CheckForFormulaString()
{
m_xTreeView->visible_foreach([this](weld::TreeIter& rEntry){
OUString sId(m_xTreeView->get_id(rEntry));
@@ -110,12 +110,12 @@ void RangeManagerTable::CheckForFormulaString()
});
}
-IMPL_LINK_NOARG(RangeManagerTable, SizeAllocHdl, const Size&, void)
+IMPL_LINK_NOARG(ScRangeManagerTable, SizeAllocHdl, const Size&, void)
{
CheckForFormulaString();
}
-void RangeManagerTable::addEntry(const ScRangeNameLine& rLine, bool bSetCurEntry)
+void ScRangeManagerTable::addEntry(const ScRangeNameLine& rLine, bool bSetCurEntry)
{
int nRow = m_xTreeView->n_children();
m_xTreeView->append();
@@ -128,14 +128,14 @@ void RangeManagerTable::addEntry(const ScRangeNameLine& rLine, bool bSetCurEntry
m_xTreeView->set_cursor(nRow);
}
-void RangeManagerTable::GetLine(ScRangeNameLine& rLine, weld::TreeIter& rEntry)
+void ScRangeManagerTable::GetLine(ScRangeNameLine& rLine, weld::TreeIter& rEntry)
{
rLine.aName = m_xTreeView->get_text(rEntry, 0);
rLine.aExpression = m_xTreeView->get_text(rEntry, 1);
rLine.aScope = m_xTreeView->get_text(rEntry, 2);
}
-void RangeManagerTable::Init()
+void ScRangeManagerTable::Init()
{
m_xTreeView->freeze();
m_xTreeView->clear();
@@ -159,7 +159,7 @@ void RangeManagerTable::Init()
m_xTreeView->thaw();
}
-std::vector<ScRangeNameLine> RangeManagerTable::GetSelectedEntries()
+std::vector<ScRangeNameLine> ScRangeManagerTable::GetSelectedEntries()
{
std::vector<ScRangeNameLine> aSelectedEntries;
m_xTreeView->selected_foreach([this, &aSelectedEntries](weld::TreeIter& rEntry){
diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx
index 2e259ed4364d..97b04395de43 100644
--- a/sc/source/ui/namedlg/namepast.cxx
+++ b/sc/source/ui/namedlg/namepast.cxx
@@ -45,7 +45,7 @@ ScNamePasteDlg::ScNamePasteDlg(weld::Window * pParent, ScDocShell* pShell)
std::unique_ptr<weld::TreeView> xTreeView(m_xBuilder->weld_tree_view("ctrl"));
xTreeView->set_size_request(xTreeView->get_approximate_digit_width() * 75,
xTreeView->get_height_rows(10));
- m_xTable.reset(new RangeManagerTable(std::move(xTreeView), m_RangeMap, aPos));
+ m_xTable.reset(new ScRangeManagerTable(std::move(xTreeView), m_RangeMap, aPos));
m_xBtnPaste->connect_clicked( LINK( this, ScNamePasteDlg, ButtonHdl) );
m_xBtnPasteAll->connect_clicked( LINK( this, ScNamePasteDlg, ButtonHdl));
More information about the Libreoffice-commits
mailing list