Kaydet (Commit) 5a24b946 authored tarafından Eike Rathke's avatar Eike Rathke

add totals to ScDBData ctor

Change-Id: I798376268b15f8b2f340d48fd2e38d68e53dbc6f
üst a1fed7b5
...@@ -79,7 +79,7 @@ public: ...@@ -79,7 +79,7 @@ public:
SC_DLLPUBLIC ScDBData(const OUString& rName, SC_DLLPUBLIC ScDBData(const OUString& rName,
SCTAB nTab, SCTAB nTab,
SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
bool bByR = true, bool bHasH = true); bool bByR = true, bool bHasH = true, bool bTotals = false);
ScDBData(const ScDBData& rData); ScDBData(const ScDBData& rData);
ScDBData(const OUString& rName, const ScDBData& rData); ScDBData(const OUString& rName, const ScDBData& rData);
virtual ~ScDBData(); virtual ~ScDBData();
......
...@@ -51,7 +51,7 @@ bool ScDBData::less::operator() (const ScDBData& left, const ScDBData& right) co ...@@ -51,7 +51,7 @@ bool ScDBData::less::operator() (const ScDBData& left, const ScDBData& right) co
ScDBData::ScDBData( const OUString& rName, ScDBData::ScDBData( const OUString& rName,
SCTAB nTab, SCTAB nTab,
SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
bool bByR, bool bHasH) : bool bByR, bool bHasH, bool bTotals) :
mpSortParam(new ScSortParam), mpSortParam(new ScSortParam),
mpQueryParam(new ScQueryParam), mpQueryParam(new ScQueryParam),
mpSubTotal(new ScSubTotalParam), mpSubTotal(new ScSubTotalParam),
...@@ -65,7 +65,7 @@ ScDBData::ScDBData( const OUString& rName, ...@@ -65,7 +65,7 @@ ScDBData::ScDBData( const OUString& rName,
nEndRow (nRow2), nEndRow (nRow2),
bByRow (bByR), bByRow (bByR),
bHasHeader (bHasH), bHasHeader (bHasH),
bHasTotals (false), bHasTotals (bTotals),
bDoSize (false), bDoSize (false),
bKeepFmt (false), bKeepFmt (false),
bStripData (false), bStripData (false),
...@@ -783,7 +783,7 @@ ScDBData* ScDBCollection::AnonDBs::getByRange(const ScRange& rRange) ...@@ -783,7 +783,7 @@ ScDBData* ScDBCollection::AnonDBs::getByRange(const ScRange& rRange)
OUString aName(STR_DB_GLOBAL_NONAME); OUString aName(STR_DB_GLOBAL_NONAME);
::std::unique_ptr<ScDBData> pNew(new ScDBData( ::std::unique_ptr<ScDBData> pNew(new ScDBData(
aName, rRange.aStart.Tab(), rRange.aStart.Col(), rRange.aStart.Row(), aName, rRange.aStart.Tab(), rRange.aStart.Col(), rRange.aStart.Row(),
rRange.aEnd.Col(), rRange.aEnd.Row(), true, false)); rRange.aEnd.Col(), rRange.aEnd.Row(), true, false, false));
pData = pNew.get(); pData = pNew.get();
o3tl::ptr_container::push_back(maDBs, std::move(pNew)); o3tl::ptr_container::push_back(maDBs, std::move(pNew));
} }
......
...@@ -456,8 +456,8 @@ IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl) ...@@ -456,8 +456,8 @@ IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl)
ScDBData* pNewEntry = new ScDBData( aNewName, aStart.Tab(), ScDBData* pNewEntry = new ScDBData( aNewName, aStart.Tab(),
aStart.Col(), aStart.Row(), aStart.Col(), aStart.Row(),
aEnd.Col(), aEnd.Row(), aEnd.Col(), aEnd.Row(),
true, m_pBtnHeader->IsChecked() ); true, m_pBtnHeader->IsChecked(),
pNewEntry->SetTotals( m_pBtnTotals->IsChecked() ); m_pBtnTotals->IsChecked() );
pNewEntry->SetDoSize( m_pBtnDoSize->IsChecked() ); pNewEntry->SetDoSize( m_pBtnDoSize->IsChecked() );
pNewEntry->SetKeepFmt( m_pBtnKeepFmt->IsChecked() ); pNewEntry->SetKeepFmt( m_pBtnKeepFmt->IsChecked() );
pNewEntry->SetStripData( m_pBtnStripData->IsChecked() ); pNewEntry->SetStripData( m_pBtnStripData->IsChecked() );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment