sc/source/ui/dataprovider/datatransformation.cxx | 7 ++-
sc/source/ui/miscdlgs/dataproviderdlg.cxx | 53 +++++++++++++++++------
2 files changed, 46 insertions(+), 14 deletions(-)
New commits:
commit cdd0a141094c9ceb690a702bb0e3d64c368c1160
Author: tushar <tusharrai...@gmail.com>
AuthorDate: Sun Jul 4 12:50:27 2021 +0530
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Tue Feb 1 11:20:54 2022 +0100
Fix issues of Data Transformations.
* Corrected Delete column Transformation considering the case when
multiple columns are provided as input.
* Corrected implementation of Split Column Transformation.
* Provided valid ranges for Sort Transformation and corrected
implementation .
Change-Id: I4558602f69bf4aa7836e1e84931fabd346f83465
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118368
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/sc/source/ui/dataprovider/datatransformation.cxx
b/sc/source/ui/dataprovider/datatransformation.cxx
index 393521dfc417..62c82adb93d4 100644
--- a/sc/source/ui/dataprovider/datatransformation.cxx
+++ b/sc/source/ui/dataprovider/datatransformation.cxx
@@ -49,9 +49,11 @@ ColumnRemoveTransformation::~ColumnRemoveTransformation()
void ColumnRemoveTransformation::Transform(ScDocument& rDoc) const
{
+ sal_Int32 nIncrementIndex = 0;
for (auto& rCol : maColumns)
{
- rDoc.DeleteCol(0, 0, rDoc.MaxRow(), 0, rCol, 1);
+ rDoc.DeleteCol(0, 0, rDoc.MaxRow(), 0, rCol - nIncrementIndex, 1);
+ nIncrementIndex++;
}
}
@@ -73,6 +75,9 @@ SplitColumnTransformation::SplitColumnTransformation(SCCOL
nCol, sal_Unicode cSe
void SplitColumnTransformation::Transform(ScDocument& rDoc) const
{
+ if (mnCol == -1)
+ return;
+
rDoc.InsertCol(0, 0, rDoc.MaxRow(), 0, mnCol + 1, 1);
SCROW nEndRow = getLastRow(rDoc, mnCol);
diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
index 8cb2d9d33a0c..16dc088aed4c 100644
--- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
+++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
@@ -39,8 +39,31 @@ public:
void updateIndex(sal_uInt32 nIndex) { mnIndex = nIndex; }
virtual std::shared_ptr<sc::DataTransformation> getTransformation() = 0;
+
+ static SCROW getLastRow(const ScDocument& rDoc);
+ static SCCOL getLastCol(const ScDocument& rDoc);
};
+SCROW ScDataTransformationBaseControl::getLastRow(const ScDocument& rDoc)
+{
+ SCROW nEndRow = rDoc.MaxRow();
+ return rDoc.GetLastDataRow(0, 0, 0, nEndRow);
+}
+
+SCCOL ScDataTransformationBaseControl::getLastCol(const ScDocument& rDoc)
+{
+ for (SCCOL nCol = 1; nCol <= rDoc.MaxCol(); ++nCol)
+ {
+ CellType eType;
+ rDoc.GetCellType(nCol, 0, 0, eType);
+ if (eType == CELLTYPE_NONE)
+ {
+ return static_cast<SCCOL>(nCol - 1 );
+ }
+ }
+ return rDoc.MaxCol();
+}
+
ScDataTransformationBaseControl::ScDataTransformationBaseControl(weld::Container*
pParent, const OUString& rUIFile, sal_uInt32 nIndex)
: mxBuilder(Application::CreateBuilder(pParent, rUIFile))
, mxGrid(mxBuilder->weld_container("grid"))
@@ -130,25 +153,25 @@ private:
std::unique_ptr<weld::Entry> mxSeparator;
std::unique_ptr<weld::Entry> mxNumColumns;
std::unique_ptr<weld::Button> mxDelete;
- SCCOL mnCol;
std::function<void(sal_uInt32&)> maDeleteTransformation;
+ const ScDocument* mpDoc;
public:
- ScSplitColumnTransformationControl(weld::Container* pParent, SCCOL nCol,
sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation);
+ ScSplitColumnTransformationControl(const ScDocument* pDoc,
weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)>
aDeleteTransformation);
virtual std::shared_ptr<sc::DataTransformation> getTransformation()
override;
DECL_LINK(DeleteHdl, weld::Button&, void);
};
ScSplitColumnTransformationControl::ScSplitColumnTransformationControl(
- weld::Container* pParent, SCCOL nCol, sal_uInt32 nIndex,
+ const ScDocument* pDoc, weld::Container* pParent, sal_uInt32 nIndex,
std::function<void(sal_uInt32&)> aDeleteTransformation)
: ScDataTransformationBaseControl(pParent,
"modules/scalc/ui/splitcolumnentry.ui", nIndex)
, mxSeparator(mxBuilder->weld_entry("ed_separator"))
, mxNumColumns(mxBuilder->weld_entry("num_cols"))
, mxDelete(mxBuilder->weld_button("ed_delete"))
- , mnCol(nCol)
, maDeleteTransformation(std::move(aDeleteTransformation))
+ , mpDoc(pDoc)
{
mxDelete->connect_clicked(LINK(this,ScSplitColumnTransformationControl,
DeleteHdl));
}
@@ -157,6 +180,11 @@ std::shared_ptr<sc::DataTransformation>
ScSplitColumnTransformationControl::getT
{
OUString aSeparator = mxSeparator->get_text();
sal_Unicode cSeparator = aSeparator.isEmpty() ? ',' : aSeparator[0];
+ OUString aColStr = mxNumColumns->get_text();
+ SCCOL mnCol = -1;
+ sal_Int32 nCol = aColStr.toInt32();
+ if (nCol > 0 && nCol <= mpDoc->MaxCol())
+ mnCol = nCol - 1;
return std::make_shared<sc::SplitColumnTransformation>(mnCol, cSeparator);
}
@@ -258,11 +286,13 @@ std::shared_ptr<sc::DataTransformation>
ScSortTransformationControl::getTransfor
aColumn = nCol - 1; // translate from 1-based column notations to
internal Calc one
ScSortParam aSortParam;
- ScSortKeyState aSortKey;
- aSortKey.bDoSort = true;
- aSortKey.nField = aColumn;
- aSortKey.bAscending = aIsAscending;
- aSortParam.maKeyState.push_back(aSortKey);
+ aSortParam.nRow1=0;
+ aSortParam.nRow2=getLastRow(*mpDoc);
+ aSortParam.nCol1=0;
+ aSortParam.nCol2=getLastCol(*mpDoc);
+ aSortParam.maKeyState[0].bDoSort = true;
+ aSortParam.maKeyState[0].nField = aColumn;
+ aSortParam.maKeyState[0].bAscending = aIsAscending;
return std::make_shared<sc::SortTransformation>(aSortParam);
}
@@ -924,11 +954,8 @@ void ScDataProviderDlg::deleteColumn()
void ScDataProviderDlg::splitColumn()
{
- SCCOL nStartCol = -1;
- SCCOL nEndCol = -1;
- mxTable->getColRange(nStartCol, nEndCol);
std::function<void(sal_uInt32&)> adeleteTransformation =
std::bind(&ScDataProviderDlg::deletefromList,this, std::placeholders::_1);
-
maControls.emplace_back(std::make_unique<ScSplitColumnTransformationControl>(mxTransformationList.get(),
nStartCol, mnIndex++, adeleteTransformation));
+
maControls.emplace_back(std::make_unique<ScSplitColumnTransformationControl>(mxDoc.get(),
mxTransformationList.get(), mnIndex++, adeleteTransformation));
}
void ScDataProviderDlg::mergeColumns()
