[Libreoffice-commits] core.git: sc/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Wed Oct 23 12:07:16 UTC 2019
sc/source/ui/miscdlgs/dataproviderdlg.cxx | 82 +++++++++++++++++-------------
sc/source/ui/miscdlgs/datastreamdlg.cxx | 2
sc/source/ui/miscdlgs/datatableview.cxx | 4 -
sc/source/ui/navipi/content.cxx | 2
4 files changed, 53 insertions(+), 37 deletions(-)
New commits:
commit 48ab1b2fbb3496cef478db11539ccd08b527656d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Oct 23 11:52:57 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Oct 23 14:06:06 2019 +0200
sc: rowcol: tdf#50916 convert miscdlgs
Change-Id: Ib8748b47e2432053ff9dfe7adec0309cd3931b2e
Reviewed-on: https://gerrit.libreoffice.org/81372
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
index ff58fd04ce9c..ab57613e2d82 100644
--- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
+++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
@@ -190,20 +190,22 @@ private:
std::unique_ptr<weld::Entry> mxColumnNums;
std::unique_ptr<weld::Button> mxDelete;
std::function<void(sal_uInt32&)> maDeleteTransformation;
+ const ScDocument* mpDoc;
public:
- ScDeleteColumnTransformationControl(weld::Container* pParent, sal_uInt32 aIndex, std::function<void(sal_uInt32&)> aDeleteTransformation);
+ ScDeleteColumnTransformationControl(const ScDocument* pDoc, weld::Container* pParent, sal_uInt32 aIndex, std::function<void(sal_uInt32&)> aDeleteTransformation);
virtual std::shared_ptr<sc::DataTransformation> getTransformation() override;
DECL_LINK(DeleteHdl, weld::Button&, void);
};
ScDeleteColumnTransformationControl::ScDeleteColumnTransformationControl(
- weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation)
+ const ScDocument* pDoc, weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation)
: ScDataTransformationBaseControl(pParent, "modules/scalc/ui/deletecolumnentry.ui", nIndex)
, mxColumnNums(mxBuilder->weld_entry("ed_columns"))
, mxDelete(mxBuilder->weld_button("ed_delete"))
, maDeleteTransformation(std::move(aDeleteTransformation))
+ , mpDoc(pDoc)
{
mxDelete->connect_clicked(LINK(this,ScDeleteColumnTransformationControl, DeleteHdl));
}
@@ -219,7 +221,7 @@ std::shared_ptr<sc::DataTransformation> ScDeleteColumnTransformationControl::get
if (nCol <= 0)
continue;
- if (nCol > MAXCOL)
+ if (nCol > mpDoc->MaxCol())
continue;
// translate from 1-based column notations to internal Calc one
@@ -272,22 +274,24 @@ private:
std::unique_ptr<weld::Entry> mxEdColumns;
std::unique_ptr<weld::Button> mxDelete;
std::function<void(sal_uInt32&)> maDeleteTransformation;
+ const ScDocument* mpDoc;
public:
- ScMergeColumnTransformationControl(weld::Container* pParent, SCCOL nStartCol, SCCOL nEndCol, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation);
+ ScMergeColumnTransformationControl(const ScDocument *pDoc, weld::Container* pParent, SCCOL nStartCol, SCCOL nEndCol, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation);
virtual std::shared_ptr<sc::DataTransformation> getTransformation() override;
DECL_LINK(DeleteHdl, weld::Button&, void);
};
ScMergeColumnTransformationControl::ScMergeColumnTransformationControl(
- weld::Container* pParent, SCCOL nStartCol, SCCOL nEndCol, sal_uInt32 nIndex,
+ const ScDocument* pDoc, weld::Container* pParent, SCCOL nStartCol, SCCOL nEndCol, sal_uInt32 nIndex,
std::function<void(sal_uInt32&)> aDeleteTransformation)
: ScDataTransformationBaseControl(pParent, "modules/scalc/ui/mergecolumnentry.ui", nIndex)
, mxSeparator(mxBuilder->weld_entry("ed_separator"))
, mxEdColumns(mxBuilder->weld_entry("ed_columns"))
, mxDelete(mxBuilder->weld_button("ed_delete"))
, maDeleteTransformation(std::move(aDeleteTransformation))
+ , mpDoc(pDoc)
{
mxDelete->connect_clicked(LINK(this,ScMergeColumnTransformationControl, DeleteHdl));
@@ -314,7 +318,7 @@ std::shared_ptr<sc::DataTransformation> ScMergeColumnTransformationControl::getT
if (nCol <= 0)
continue;
- if (nCol > MAXCOL)
+ if (nCol > mpDoc->MaxCol())
continue;
// translate from 1-based column notations to internal Calc one
@@ -330,21 +334,23 @@ private:
std::unique_ptr<weld::Entry> mxEdColumns;
std::unique_ptr<weld::Button> mxDelete;
std::function<void(sal_uInt32&)> maDeleteTransformation;
+ const ScDocument* mpDoc;
public:
- ScSortTransformationControl(weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation);
+ ScSortTransformationControl(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);
};
ScSortTransformationControl::ScSortTransformationControl(
- weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation)
+ const ScDocument* pDoc, weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation)
: ScDataTransformationBaseControl(pParent, "modules/scalc/ui/sorttransformationentry.ui", nIndex)
, mxAscending(mxBuilder->weld_check_button("ed_ascending"))
, mxEdColumns(mxBuilder->weld_entry("ed_columns"))
, mxDelete(mxBuilder->weld_button("ed_delete"))
, maDeleteTransformation(std::move(aDeleteTransformation))
+ , mpDoc(pDoc)
{
mxDelete->connect_clicked(LINK(this,ScSortTransformationControl, DeleteHdl));
}
@@ -355,7 +361,7 @@ std::shared_ptr<sc::DataTransformation> ScSortTransformationControl::getTransfor
bool aIsAscending = mxAscending->get_active();
SCCOL aColumn = 0;
sal_Int32 nCol = aColStr.toInt32();
- if (nCol > 0 && nCol <= MAXCOL)
+ if (nCol > 0 && nCol <= mpDoc->MaxCol())
aColumn = nCol - 1; // translate from 1-based column notations to internal Calc one
ScSortParam aSortParam;
@@ -374,21 +380,23 @@ private:
std::unique_ptr<weld::ComboBox> mxType;
std::unique_ptr<weld::Button> mxDelete;
std::function<void(sal_uInt32&)> maDeleteTransformation;
+ const ScDocument* mpDoc;
public:
- ScColumnTextTransformation(weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation);
+ ScColumnTextTransformation(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);
};
ScColumnTextTransformation::ScColumnTextTransformation(
- weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation)
+ const ScDocument* pDoc, weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation)
: ScDataTransformationBaseControl(pParent, "modules/scalc/ui/texttransformationentry.ui", nIndex)
, mxColumnNums(mxBuilder->weld_entry("ed_columns"))
, mxType(mxBuilder->weld_combo_box("ed_lst"))
, mxDelete(mxBuilder->weld_button("ed_delete"))
, maDeleteTransformation(std::move(aDeleteTransformation))
+ , mpDoc(pDoc)
{
mxDelete->connect_clicked(LINK(this,ScColumnTextTransformation, DeleteHdl));
}
@@ -404,7 +412,7 @@ std::shared_ptr<sc::DataTransformation> ScColumnTextTransformation::getTransform
if (nCol <= 0)
continue;
- if (nCol > MAXCOL)
+ if (nCol > mpDoc->MaxCol())
continue;
// translate from 1-based column notations to internal Calc one
@@ -436,21 +444,23 @@ private:
std::unique_ptr<weld::ComboBox> mxType;
std::unique_ptr<weld::Button> mxDelete;
std::function<void(sal_uInt32&)> maDeleteTransformation;
+ const ScDocument* mpDoc;
public:
- ScAggregateFunction(weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation);
+ ScAggregateFunction(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);
};
-ScAggregateFunction::ScAggregateFunction(weld::Container* pParent, sal_uInt32 nIndex,
+ScAggregateFunction::ScAggregateFunction(const ScDocument* pDoc, weld::Container* pParent, sal_uInt32 nIndex,
std::function<void(sal_uInt32&)> aDeleteTransformation)
: ScDataTransformationBaseControl(pParent, "modules/scalc/ui/aggregatefunctionentry.ui", nIndex)
, mxColumnNums(mxBuilder->weld_entry("ed_columns"))
, mxType(mxBuilder->weld_combo_box("ed_lst"))
, mxDelete(mxBuilder->weld_button("ed_delete"))
, maDeleteTransformation(std::move(aDeleteTransformation))
+ , mpDoc(pDoc)
{
mxDelete->connect_clicked(LINK(this,ScAggregateFunction, DeleteHdl));
}
@@ -467,7 +477,7 @@ std::shared_ptr<sc::DataTransformation> ScAggregateFunction::getTransformation()
if (nCol <= 0)
continue;
- if (nCol > MAXCOL)
+ if (nCol > mpDoc->MaxCol())
continue;
// translate from 1-based column notations to internal Calc one
@@ -497,21 +507,23 @@ private:
std::unique_ptr<weld::ComboBox> mxType;
std::unique_ptr<weld::Button> mxDelete;
std::function<void(sal_uInt32&)> maDeleteTransformation;
+ const ScDocument* mpDoc;
public:
- ScNumberTransformation(weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation);
+ ScNumberTransformation(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);
};
ScNumberTransformation::ScNumberTransformation(
- weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation)
+ const ScDocument *pDoc, weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation)
: ScDataTransformationBaseControl(pParent, "modules/scalc/ui/numbertransformationentry.ui", nIndex)
, mxColumnNums(mxBuilder->weld_entry("ed_columns"))
, mxType(mxBuilder->weld_combo_box("ed_lst"))
, mxDelete(mxBuilder->weld_button("ed_delete"))
, maDeleteTransformation(std::move(aDeleteTransformation))
+ , mpDoc(pDoc)
{
mxDelete->connect_clicked(LINK(this,ScNumberTransformation, DeleteHdl));
}
@@ -528,7 +540,7 @@ std::shared_ptr<sc::DataTransformation> ScNumberTransformation::getTransformatio
if (nCol <= 0)
continue;
- if (nCol > MAXCOL)
+ if (nCol > mpDoc->MaxCol())
continue;
// translate from 1-based column notations to internal Calc one
@@ -576,21 +588,23 @@ private:
std::unique_ptr<weld::Entry> mxReplaceString;
std::unique_ptr<weld::Button> mxDelete;
std::function<void(sal_uInt32&)> maDeleteTransformation;
+ const ScDocument *mpDoc;
public:
- ScReplaceNullTransformation(weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation);
+ ScReplaceNullTransformation(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);
};
-ScReplaceNullTransformation::ScReplaceNullTransformation(weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation)
+ScReplaceNullTransformation::ScReplaceNullTransformation(const ScDocument *pDoc, weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation)
: ScDataTransformationBaseControl(pParent,"modules/scalc/ui/replacenulltransformationentry.ui", nIndex)
, mxColumnNums(mxBuilder->weld_entry("ed_columns"))
, mxReplaceString(mxBuilder->weld_entry("ed_str"))
, mxDelete(mxBuilder->weld_button("ed_delete"))
, maDeleteTransformation(aDeleteTransformation)
+ , mpDoc(pDoc)
{
mxDelete->connect_clicked(LINK(this,ScReplaceNullTransformation, DeleteHdl));
}
@@ -608,7 +622,7 @@ std::shared_ptr<sc::DataTransformation> ScReplaceNullTransformation::getTransfor
if (nCol <= 0)
continue;
- if (nCol > MAXCOL)
+ if (nCol > mpDoc->MaxCol())
continue;
// translate from 1-based column notations to internal Calc one
@@ -625,21 +639,23 @@ private:
std::unique_ptr<weld::ComboBox> mxType;
std::unique_ptr<weld::Button> mxDelete;
std::function<void(sal_uInt32&)> maDeleteTransformation;
+ const ScDocument* mpDoc;
public:
- ScDateTimeTransformation(weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation);
+ ScDateTimeTransformation(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);
};
-ScDateTimeTransformation::ScDateTimeTransformation(weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation)
+ScDateTimeTransformation::ScDateTimeTransformation(const ScDocument* pDoc, weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)> aDeleteTransformation)
: ScDataTransformationBaseControl(pParent,"modules/scalc/ui/datetimetransformationentry.ui", nIndex)
, mxColumnNums(mxBuilder->weld_entry("ed_columns"))
, mxType(mxBuilder->weld_combo_box("ed_lst"))
, mxDelete(mxBuilder->weld_button("ed_delete"))
, maDeleteTransformation(aDeleteTransformation)
+ , mpDoc(pDoc)
{
mxDelete->connect_clicked(LINK(this,ScDateTimeTransformation, DeleteHdl));
}
@@ -656,7 +672,7 @@ std::shared_ptr<sc::DataTransformation> ScDateTimeTransformation::getTransformat
if (nCol <= 0)
continue;
- if (nCol > MAXCOL)
+ if (nCol > mpDoc->MaxCol())
continue;
// translate from 1-based column notations to internal Calc one
@@ -736,7 +752,7 @@ ScDataProviderDlg::ScDataProviderDlg(weld::Window* pParent, std::shared_ptr<ScDo
mxDBRanges->append_text(rNamedDB->GetName());
}
- pDBData = new ScDBData("data", 0, 0, 0, MAXCOL, MAXROW);
+ pDBData = new ScDBData("data", 0, 0, 0, mxDoc->MaxCol(), mxDoc->MaxRow());
bool bSuccess = mxDoc->GetDBCollection()->getNamedDBs().insert(std::unique_ptr<ScDBData>(pDBData));
SAL_WARN_IF(!bSuccess, "sc", "temporary warning");
@@ -818,7 +834,7 @@ void ScDataProviderDlg::cancelAndQuit()
void ScDataProviderDlg::deleteColumn()
{
std::function<void(sal_uInt32&)> adeleteTransformation = std::bind(&ScDataProviderDlg::deletefromList,this, std::placeholders::_1);
- maControls.emplace_back(std::make_unique<ScDeleteColumnTransformationControl>(mxList.get(), mnIndex++, adeleteTransformation));
+ maControls.emplace_back(std::make_unique<ScDeleteColumnTransformationControl>(mxDoc.get(), mxList.get(), mnIndex++, adeleteTransformation));
}
void ScDataProviderDlg::splitColumn()
@@ -836,43 +852,43 @@ void ScDataProviderDlg::mergeColumns()
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<ScMergeColumnTransformationControl>(mxList.get(), nStartCol, nEndCol, mnIndex++, adeleteTransformation));
+ maControls.emplace_back(std::make_unique<ScMergeColumnTransformationControl>(mxDoc.get(), mxList.get(), nStartCol, nEndCol, mnIndex++, adeleteTransformation));
}
void ScDataProviderDlg::textTransformation()
{
std::function<void(sal_uInt32&)> adeleteTransformation = std::bind(&ScDataProviderDlg::deletefromList,this, std::placeholders::_1);
- maControls.emplace_back(std::make_unique<ScColumnTextTransformation>(mxList.get(), mnIndex++, adeleteTransformation));
+ maControls.emplace_back(std::make_unique<ScColumnTextTransformation>(mxDoc.get(), mxList.get(), mnIndex++, adeleteTransformation));
}
void ScDataProviderDlg::sortTransformation()
{
std::function<void(sal_uInt32&)> adeleteTransformation = std::bind(&ScDataProviderDlg::deletefromList,this, std::placeholders::_1);
- maControls.emplace_back(std::make_unique<ScSortTransformationControl>(mxList.get(), mnIndex++, adeleteTransformation));
+ maControls.emplace_back(std::make_unique<ScSortTransformationControl>(mxDoc.get(), mxList.get(), mnIndex++, adeleteTransformation));
}
void ScDataProviderDlg::aggregateFunction()
{
std::function<void(sal_uInt32&)> adeleteTransformation = std::bind(&ScDataProviderDlg::deletefromList,this, std::placeholders::_1);
- maControls.emplace_back(std::make_unique<ScAggregateFunction>(mxList.get(), mnIndex++, adeleteTransformation));
+ maControls.emplace_back(std::make_unique<ScAggregateFunction>(mxDoc.get(), mxList.get(), mnIndex++, adeleteTransformation));
}
void ScDataProviderDlg::numberTransformation()
{
std::function<void(sal_uInt32&)> adeleteTransformation = std::bind(&ScDataProviderDlg::deletefromList,this, std::placeholders::_1);
- maControls.emplace_back(std::make_unique<ScNumberTransformation>(mxList.get(), mnIndex++, adeleteTransformation));
+ maControls.emplace_back(std::make_unique<ScNumberTransformation>(mxDoc.get(), mxList.get(), mnIndex++, adeleteTransformation));
}
void ScDataProviderDlg::replaceNullTransformation()
{
std::function<void(sal_uInt32&)> adeleteTransformation = std::bind(&ScDataProviderDlg::deletefromList,this, std::placeholders::_1);
- maControls.emplace_back(std::make_unique<ScReplaceNullTransformation>(mxList.get(), mnIndex++, adeleteTransformation));
+ maControls.emplace_back(std::make_unique<ScReplaceNullTransformation>(mxDoc.get(), mxList.get(), mnIndex++, adeleteTransformation));
}
void ScDataProviderDlg::dateTimeTransformation()
{
std::function<void(sal_uInt32&)> adeleteTransformation = std::bind(&ScDataProviderDlg::deletefromList,this, std::placeholders::_1);
- maControls.emplace_back(std::make_unique<ScDateTimeTransformation>(mxList.get(), mnIndex++, adeleteTransformation));
+ maControls.emplace_back(std::make_unique<ScDateTimeTransformation>(mxDoc.get(), mxList.get(), mnIndex++, adeleteTransformation));
}
namespace {
diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index de2fe23b3003..3fcf2e884091 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -133,7 +133,7 @@ void DataStreamDlg::Init( const DataStream& rStrm )
m_xEdRange->set_text(aStr);
SCROW nRows = aRange.aEnd.Row() - aRange.aStart.Row() + 1;
- if (aRange.aEnd.Row() == MAXROW)
+ if (aRange.aEnd.Row() == rDoc.MaxRow())
m_xRBUnlimited->set_active(true);
else
{
diff --git a/sc/source/ui/miscdlgs/datatableview.cxx b/sc/source/ui/miscdlgs/datatableview.cxx
index 6d08630d009f..16463598e1fe 100644
--- a/sc/source/ui/miscdlgs/datatableview.cxx
+++ b/sc/source/ui/miscdlgs/datatableview.cxx
@@ -205,7 +205,7 @@ SCCOL findColFromPos(sal_uInt16 nPixelPos, const ScDocument* pDoc, SCCOL nStartC
{
nPixelPos -= nRowHeaderWidth;
sal_uInt32 nPixelLength = 0;
- for (SCCOL nCol : pDoc->GetColumnsRange(0, nStartCol, MAXCOL))
+ for (SCCOL nCol : pDoc->GetColumnsRange(0, nStartCol, pDoc->MaxCol()))
{
sal_uInt16 nColWidth = pDoc->GetColWidth(nCol, 0, true);
sal_uInt32 nPixel = ScViewData::ToPixel(nColWidth, nPPTX);
@@ -225,7 +225,7 @@ SCROW findRowFromPos(sal_uInt16 nPixelPos, const ScDocument* pDoc, SCROW nStartR
{
nPixelPos -= nColHeaderHeight;
sal_uInt32 nPixelLength = 0;
- for (SCROW nRow = nStartRow; nRow <= MAXROW; ++nRow)
+ for (SCROW nRow = nStartRow; nRow <= pDoc->MaxRow(); ++nRow)
{
sal_uInt16 nColWidth = pDoc->GetRowHeight(nRow, SCTAB(0), true);
sal_uInt32 nPixel = ScViewData::ToPixel(nColWidth, nPPTX);
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 8d120a9194f5..af866cb5f054 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -1396,7 +1396,7 @@ void ScContentTree::DoDrag()
SCTAB nTab;
if ( rSrcDoc.GetTable( aText, nTab ) )
{
- ScRange aRange( 0,0,nTab, MAXCOL,MAXROW,nTab );
+ ScRange aRange( 0,0,nTab, pLocalDoc->MaxCol(), pLocalDoc->MaxRow(),nTab );
lcl_DoDragCells( pSrcShell, aRange, (ScDragSrc::Navigator | ScDragSrc::Table), this );
}
}
More information about the Libreoffice-commits
mailing list