diff options
author | Eike Rathke <erack@redhat.com> | 2017-07-17 12:30:18 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2017-07-17 12:30:25 +0200 |
commit | fe6af0a260301f50a83c0b14a7fabad9fffe78cf (patch) | |
tree | b317770b16983e0b7d988d365d7962a91e56aeb1 | |
parent | cc6c5ae6333ccff08d0d82b36c269112cf55d89b (diff) |
Temporary ScAddress is unnecessary when constructing ScRange
Change-Id: I9160eb2c0fe79a5a56b4a4e524d163133f6dc65b
-rw-r--r-- | sc/qa/unit/ucalc.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocument.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/dbgui/dbnamdlg.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/crnrdlg.cxx | 3 |
5 files changed, 5 insertions, 8 deletions
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 644d86c71e4f..67603873fccc 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -3836,7 +3836,7 @@ void Test::testCutPasteRefUndo() // At this point, the ref undo document should contain a formula cell at A2 that references B2. ASSERT_FORMULA_EQUAL(*pUndoDoc, ScAddress(0,1,0), "B2", "A2 in the undo document should be referencing B2."); - ScUndoPaste aUndo(&getDocShell(), ScRange(ScAddress(2,1,0)), aMark, pUndoDoc, nullptr, InsertDeleteFlags::CONTENTS, nullptr, false, nullptr); + ScUndoPaste aUndo(&getDocShell(), ScRange(2,1,0), aMark, pUndoDoc, nullptr, InsertDeleteFlags::CONTENTS, nullptr, false, nullptr); aUndo.Undo(); // Now A2 should be referencing B2 once again. diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index efe77b65900e..76bd1b0774d0 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -2189,7 +2189,7 @@ bool ScAccessibleDocument::IsTableSelected() const //#103800#; use a copy of MarkData ScMarkData aMarkData(mpViewShell->GetViewData().GetMarkData()); aMarkData.MarkToMulti(); - if (aMarkData.IsAllMarked(ScRange(ScAddress(0, 0, nTab),ScAddress(MAXCOL, MAXROW, nTab)))) + if (aMarkData.IsAllMarked( ScRange( 0, 0, nTab, MAXCOL, MAXROW, nTab))) bResult = true; } return bResult; diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 07bbd197e348..c456a42f685b 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -253,8 +253,7 @@ ScAccessibleSpreadsheet::ScAccessibleSpreadsheet( SCTAB nTab, ScSplitPos eSplitPos) : - ScAccessibleTableBase (pAccDoc, GetDocument(pViewShell), - ScRange(ScAddress(0, 0, nTab),ScAddress(MAXCOL, MAXROW, nTab))), + ScAccessibleTableBase( pAccDoc, GetDocument(pViewShell), ScRange( 0, 0, nTab, MAXCOL, MAXROW, nTab)), mbIsSpreadsheet( true ), m_bFormulaMode( false ), m_bFormulaLastMode( false ), diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index e7ca94284268..65b66db6e89f 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -217,8 +217,7 @@ void ScDbNameDlg::Init() pViewData->GetSimpleArea( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab ); - theCurArea = ScRange( ScAddress( nStartCol, nStartRow, nStartTab ), - ScAddress( nEndCol, nEndRow, nEndTab ) ); + theCurArea = ScRange( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab); theAreaStr = theCurArea.Format(ScRefFlags::RANGE_ABS_3D, pDoc, aAddrDetails); diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 6b55fd0a898f..aa01ad485303 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -135,8 +135,7 @@ void ScColRowNameRangesDlg::Init() SCTAB nEndTab = 0; pViewData->GetSimpleArea( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab ); - SetColRowData( ScRange( ScAddress( nStartCol, nStartRow, nStartTab ), - ScAddress( nEndCol, nEndRow, nEndTab ) ) ); + SetColRowData( ScRange( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab)); } else { |