[Libreoffice-commits] .: sc/inc sc/source
Kohei Yoshida
kohei at kemper.freedesktop.org
Fri Dec 10 10:45:58 PST 2010
sc/inc/rangelst.hxx | 3 +--
sc/source/core/data/clipparam.cxx | 4 ++--
sc/source/core/data/documen5.cxx | 2 +-
sc/source/core/data/document.cxx | 6 +++---
sc/source/core/data/table2.cxx | 2 +-
sc/source/core/data/table6.cxx | 8 ++++----
sc/source/core/tool/chartarr.cxx | 2 +-
sc/source/core/tool/charthelper.cxx | 2 +-
sc/source/core/tool/chartpos.cxx | 6 +++---
sc/source/filter/excel/xecontent.cxx | 4 ++--
sc/source/filter/excel/xehelper.cxx | 2 +-
sc/source/filter/excel/xicontent.cxx | 4 ++--
sc/source/filter/excel/xiescher.cxx | 4 ++--
sc/source/filter/excel/xistyle.cxx | 2 +-
sc/source/filter/html/htmlpars.cxx | 4 ++--
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 2 +-
sc/source/ui/docshell/docfunc.cxx | 2 +-
sc/source/ui/miscdlgs/acredlin.cxx | 6 +++---
sc/source/ui/miscdlgs/anyrefdg.cxx | 4 ++--
sc/source/ui/unoobj/chart2uno.cxx | 4 ++--
sc/source/ui/vba/vbapagesetup.cxx | 2 +-
sc/source/ui/vba/vbarange.cxx | 2 +-
sc/source/ui/view/viewfun2.cxx | 4 ++--
sc/source/ui/view/viewfun3.cxx | 4 ++--
24 files changed, 42 insertions(+), 43 deletions(-)
New commits:
commit 9b54cbae02e513dca7fc9451a39ce24866dbc036
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Fri Dec 10 13:45:31 2010 -0500
ScRangePtr is now gone. Good riddance.
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 04b6b61..0e4314f 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -36,7 +36,6 @@
class ScDocument;
-typedef ScRange* ScRangePtr;
class SC_DLLPUBLIC ScRangeList : public SvRefBase
{
public:
@@ -46,7 +45,7 @@ public:
ScRangeList& operator=(const ScRangeList& rList);
void Append( const ScRange& rRange )
{
- ScRangePtr pR = new ScRange( rRange );
+ ScRange* pR = new ScRange( rRange );
maRanges.push_back( pR );
}
diff --git a/sc/source/core/data/clipparam.cxx b/sc/source/core/data/clipparam.cxx
index b4edeea..06667db 100644
--- a/sc/source/core/data/clipparam.cxx
+++ b/sc/source/core/data/clipparam.cxx
@@ -72,7 +72,7 @@ SCCOL ScClipParam::getPasteColSize()
SCCOL nColSize = 0;
for ( size_t i = 0, nListSize = maRanges.size(); i < nListSize; ++i )
{
- ScRangePtr p = maRanges[ i ];
+ ScRange* p = maRanges[ i ];
nColSize += p->aEnd.Col() - p->aStart.Col() + 1;
}
return nColSize;
@@ -108,7 +108,7 @@ SCROW ScClipParam::getPasteRowSize()
SCROW nRowSize = 0;
for ( size_t i = 0, nListSize = maRanges.size(); i < nListSize; ++i )
{
- ScRangePtr p = maRanges[ i ];
+ ScRange* p = maRanges[ i ];
nRowSize += p->aEnd.Row() - p->aStart.Row() + 1;
}
return nRowSize;
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index a5ebc87..0d4ccee 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -514,7 +514,7 @@ void ScDocument::UpdateChartRef( UpdateRefMode eUpdateRefMode,
BOOL bDataChanged = FALSE;
for ( size_t i = 0, nListSize = aRLR->size(); i < nListSize; ++i )
{
- ScRangePtr pR = aRLR->at( i );
+ ScRange* pR = aRLR->at( i );
SCCOL theCol1 = pR->aStart.Col();
SCROW theRow1 = pR->aStart.Row();
SCTAB theTab1 = pR->aStart.Tab();
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 3688ae7..78f021f 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2391,7 +2391,7 @@ void ScDocument::CopyMultiRangeFromClip(
for ( size_t i = 0, n = rClipParam.maRanges.size(); i < n; ++i )
{
- ScRangePtr p = rClipParam.maRanges[ i ];
+ ScRange* p = rClipParam.maRanges[ i ];
// The begin row must not be filtered.
SCROW nRowCount = p->aEnd.Row() - p->aStart.Row() + 1;
@@ -2491,7 +2491,7 @@ void ScDocument::GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered
// No clip range. Bail out.
return;
- ScRangePtr p = rClipRanges.front();
+ ScRange* p = rClipRanges.front();
SCCOL nStartCol = p->aStart.Col();
SCCOL nEndCol = p->aEnd.Col();
SCROW nStartRow = p->aStart.Row();
@@ -2562,7 +2562,7 @@ BOOL ScDocument::HasClipFilteredRows()
for ( size_t i = 0, n = rClipRanges.size(); i < n; ++i )
{
- ScRangePtr p = rClipRanges[ i ];
+ ScRange* p = rClipRanges[ i ];
bool bAnswer = pTab[nCountTab]->HasFilteredRows(p->aStart.Row(), p->aEnd.Row());
if (bAnswer)
return true;
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 3a7752a..bf02dce 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -472,7 +472,7 @@ void ScTable::CopyToClip(const ScRangeList& rRanges, ScTable* pTable,
ScRangeList aRanges(rRanges);
for ( size_t i = 0, nListSize = aRanges.size(); i < nListSize; ++i )
{
- ScRangePtr p = aRanges[ i ];
+ ScRange* p = aRanges[ i ];
CopyToClip(p->aStart.Col(), p->aStart.Row(), p->aEnd.Col(), p->aEnd.Row(),
pTable, bKeepScenarioFlags, bCloneNoteCaptions);
}
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 11548ed..842f7f4 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -770,7 +770,7 @@ bool ScTable::SearchAndReplaceEmptyCells(
rMark.FillRangeListWithMarks(&aMarkedRanges, true);
for ( size_t i = 0, n = aMarkedRanges.size(); i < n; ++i )
{
- ScRangePtr p = aMarkedRanges[ i ];
+ ScRange* p = aMarkedRanges[ i ];
if (p->aStart.Col() > nColEnd || p->aStart.Row() > nRowEnd)
// This range is outside the data area. Skip it.
continue;
@@ -798,7 +798,7 @@ bool ScTable::SearchAndReplaceEmptyCells(
{
for ( size_t i = aRanges.size(); i > 0; --i )
{
- ScRangePtr p = aRanges[ i - 1 ];
+ ScRange* p = aRanges[ i - 1 ];
if (SearchRangeForEmptyCell( *p, rSearchItem, rCol, rRow, rUndoStr, pUndoDoc))
return true;
}
@@ -807,7 +807,7 @@ bool ScTable::SearchAndReplaceEmptyCells(
{
for ( size_t i = 0, nListSize = aRanges.size(); i < nListSize; ++i )
{
- ScRangePtr p = aRanges[ i ];
+ ScRange* p = aRanges[ i ];
if (SearchRangeForEmptyCell( *p, rSearchItem, rCol, rRow, rUndoStr, pUndoDoc ))
return true;
}
@@ -820,7 +820,7 @@ bool ScTable::SearchAndReplaceEmptyCells(
aNewMark.ResetMark();
for ( size_t i = 0, nListSize = aRanges.size(); i < nListSize; ++i )
{
- ScRangePtr p = aRanges[ i ];
+ ScRange* p = aRanges[ i ];
bFound |= SearchRangeForAllEmptyCells(*p, rSearchItem, aNewMark, rUndoStr, pUndoDoc);
}
rMark = aNewMark;
diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx
index f7fe3bc..4a4dd1b 100644
--- a/sc/source/core/tool/chartarr.cxx
+++ b/sc/source/core/tool/chartarr.cxx
@@ -134,7 +134,7 @@ ScMemChart* ScChartArray::CreateMemChart()
return CreateMemChartMulti();
else if ( nCount == 1 )
{
- ScRangePtr pR = aRangeListRef->front();
+ ScRange* pR = aRangeListRef->front();
if ( pR->aStart.Tab() != pR->aEnd.Tab() )
return CreateMemChartMulti();
else
diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx
index 963563e..5d7e108 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -101,7 +101,7 @@ BOOL lcl_AdjustRanges( ScRangeList& rRanges, SCTAB nSourceTab, SCTAB nDestTab, S
for ( size_t i=0, nCount = rRanges.size(); i < nCount; i++ )
{
- ScRangePtr pRange = rRanges[ i ];
+ ScRange* pRange = rRanges[ i ];
if ( pRange->aStart.Tab() == nSourceTab && pRange->aEnd.Tab() == nSourceTab )
{
pRange->aStart.SetTab( nDestTab );
diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx
index ae4bd80..70c33da 100644
--- a/sc/source/core/tool/chartpos.cxx
+++ b/sc/source/core/tool/chartpos.cxx
@@ -105,7 +105,7 @@ void ScChartPositioner::GlueState()
if ( eGlue != SC_CHARTGLUE_NA )
return;
bDummyUpperLeft = FALSE;
- ScRangePtr pR;
+ ScRange* pR;
if ( aRangeListRef->size() <= 1 )
{
if ( !aRangeListRef->empty() )
@@ -326,7 +326,7 @@ void ScChartPositioner::CheckColRowHeaders()
++i
)
{
- ScRangePtr pR = aRangeListRef->at( i );
+ ScRange* pR = aRangeListRef->at( i );
pR->GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
BOOL bTopRow = (nRow1 == nStartRow);
if ( bRowStrings && (bVert || nCol1 == nStartCol) )
@@ -397,7 +397,7 @@ void ScChartPositioner::CreatePositionMap()
SCROW nNoGlueRow = 0;
for ( size_t i = 0, nRanges = aRangeListRef->size(); i < nRanges; ++i )
{
- ScRangePtr pR = aRangeListRef->at( i );
+ ScRange* pR = aRangeListRef->at( i );
pR->GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
for ( nTab = nTab1; nTab <= nTab2; nTab++ )
{
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 0464bad..8ce08e4 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -337,7 +337,7 @@ sal_uInt32 XclExpMergedcells::GetBaseXFId( const ScAddress& rPos ) const
ScRangeList& rNCRanges = const_cast< ScRangeList& >( maMergedRanges );
for ( size_t i = 0, nRanges = rNCRanges.size(); i < nRanges; ++i, ++aIt )
{
- const ScRangePtr pScRange = rNCRanges[ i ];
+ const ScRange* pScRange = rNCRanges[ i ];
if( pScRange->In( rPos ) )
return *aIt;
}
@@ -581,7 +581,7 @@ XclExpLabelranges::XclExpLabelranges( const XclExpRoot& rRoot ) :
// row labels only over 1 column (restriction of Excel97/2000/XP)
for ( size_t i = 0, nRanges = maRowRanges.size(); i < nRanges; ++i )
{
- ScRangePtr pScRange = maRowRanges[ i ];
+ ScRange* pScRange = maRowRanges[ i ];
if( pScRange->aStart.Col() != pScRange->aEnd.Col() )
pScRange->aEnd.SetCol( pScRange->aStart.Col() );
}
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index b5da0c6..2d4d927 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -262,7 +262,7 @@ void XclExpAddressConverter::ValidateRangeList( ScRangeList& rScRanges, bool bWa
{
for ( size_t nRange = rScRanges.size(); nRange > 0; )
{
- ScRangePtr pScRange = rScRanges[ --nRange ];
+ ScRange* pScRange = rScRanges[ --nRange ];
if( !CheckRange( *pScRange, bWarn ) )
delete rScRanges.Remove(nRange);
}
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 7e15282..98f93df 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -648,7 +648,7 @@ void XclImpCondFormat::Apply()
// maRanges contains only valid cell ranges
for ( size_t i = 0, nRanges = maRanges.size(); i < nRanges; ++i )
{
- const ScRangePtr pScRange = maRanges[ i ];
+ const ScRange* pScRange = maRanges[ i ];
rDoc.ApplyPatternAreaTab(
pScRange->aStart.Col(), pScRange->aStart.Row(),
pScRange->aEnd.Col(), pScRange->aEnd.Row(),
@@ -870,7 +870,7 @@ void XclImpValidationManager::Apply()
// apply all ranges
for ( size_t i = 0, nRanges = rItem.maRanges.size(); i < nRanges; ++i )
{
- const ScRangePtr pScRange = rItem.maRanges[ i ];
+ const ScRange* pScRange = rItem.maRanges[ i ];
rDoc.ApplyPatternAreaTab( pScRange->aStart.Col(), pScRange->aStart.Row(),
pScRange->aEnd.Col(), pScRange->aEnd.Row(), pScRange->aStart.Tab(), aPattern );
}
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index cf9d15c..a7fa5fb 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -1862,7 +1862,7 @@ void XclImpControlHelper::ReadCellLinkFormula( XclImpStream& rStrm, bool bWithBo
// Use first cell of first range
if ( !aScRanges.empty() )
{
- const ScRangePtr pScRange = aScRanges.front();
+ const ScRange* pScRange = aScRanges.front();
mxCellLink.reset( new ScAddress( pScRange->aStart ) );
}
}
@@ -1874,7 +1874,7 @@ void XclImpControlHelper::ReadSourceRangeFormula( XclImpStream& rStrm, bool bWit
// Use first range
if ( !aScRanges.empty() )
{
- const ScRangePtr pScRange = aScRanges.front();
+ const ScRange* pScRange = aScRanges.front();
mxSrcRange.reset( new ScRange( *pScRange ) );
}
}
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 71838b0..3105816 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1920,7 +1920,7 @@ void XclImpXFRangeBuffer::Finalize()
// apply cell merging
for ( size_t i = 0, nRange = maMergeList.size(); i < nRange; ++i )
{
- const ScRangePtr pRange = maMergeList[ i ];
+ const ScRange* pRange = maMergeList[ i ];
const ScAddress& rStart = pRange->aStart;
const ScAddress& rEnd = pRange->aEnd;
bool bMultiCol = rStart.Col() != rEnd.Col();
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 5e03a9d..88bf47f 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -372,7 +372,7 @@ void ScHTMLLayoutParser::SkipLocked( ScEEParseEntry* pE, BOOL bJoin )
bAgain = FALSE;
for ( size_t i = 0, nRanges = xLockedList->size(); i < nRanges; ++i )
{
- ScRangePtr pR = xLockedList->at( i );
+ ScRange* pR = xLockedList->at( i );
if ( pR->Intersects( aRange ) )
{
pE->nCol = pR->aEnd.Col() + 1;
@@ -2625,7 +2625,7 @@ void ScHTMLTable::FillEmptyCells()
// insert the final vertically merged ranges into maUsedCells
for ( size_t i = 0, nRanges = maVMergedCells.size(); i < nRanges; ++i )
{
- ScRangePtr pRange = maVMergedCells[ i ];
+ ScRange* pRange = maVMergedCells[ i ];
maUsedCells.Join( *pRange );
}
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 06f8d9c..b10becb 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -766,7 +766,7 @@ void ScAccessibleSpreadsheet::CreateSortedMarkedCells()
mpSortedMarkedCells->reserve(mpMarkedRanges->GetCellCount());
for ( size_t i = 0, ListSize = mpMarkedRanges->size(); i < ListSize; ++i )
{
- ScRangePtr pRange = mpMarkedRanges->at( i );
+ ScRange* pRange = mpMarkedRanges->at( i );
if (pRange->aStart.Tab() != pRange->aEnd.Tab())
{
if ((maActiveCell.Tab() >= pRange->aStart.Tab()) ||
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 8557360..2bf3bde 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -549,7 +549,7 @@ static void lcl_collectAllPredOrSuccRanges(
ScRangeList aSrcRanges(rSrcRanges);
if ( aSrcRanges.empty() )
return;
- ScRangePtr p = aSrcRanges.front();
+ ScRange* p = aSrcRanges.front();
ScDetectiveFunc aDetFunc(pDoc, p->aStart.Tab());
ScRangeList aDestRanges;
for ( size_t i = 1, ListSize = aSrcRanges.size(); i < ListSize; ++i )
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 2640674..011f656 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -396,7 +396,7 @@ BOOL ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction)
{
for ( size_t i = 0, nRanges = aRangeList.size(); i < nRanges; ++i )
{
- ScRangePtr pRangeEntry = aRangeList[ i ];
+ ScRange* pRangeEntry = aRangeList[ i ];
if (pRangeEntry->Intersects(aRef)) {
bFlag = TRUE;
break;
@@ -518,7 +518,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA
{
for ( size_t i = 0, nRanges = aRangeList.size(); i < nRanges; ++i )
{
- ScRangePtr pRangeEntry = aRangeList[ i ];
+ ScRange* pRangeEntry = aRangeList[ i ];
if( pRangeEntry->Intersects(aRef) )
{
bHasFilterEntry=TRUE;
@@ -585,7 +585,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChang
{
for ( size_t i = 0, nRanges = aRangeList.size(); i < nRanges; ++i )
{
- ScRangePtr pRangeEntry=aRangeList[ i ];
+ ScRange* pRangeEntry=aRangeList[ i ];
if( pRangeEntry->Intersects(aRef) )
{
if( pScChangeAction->GetState()==eState )
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 90277da..a37eea2 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -149,7 +149,7 @@ void ScFormulaReferenceHelper::ShowSimpleReference( const XubString& rStr )
{
for ( size_t i = 0, nRanges = aRangeList.size(); i < nRanges; ++i )
{
- ScRangePtr pRangeEntry = aRangeList[ i ];
+ ScRange* pRangeEntry = aRangeList[ i ];
ColorData aColName = ScRangeFindList::GetColorName( i );
pTabViewShell->AddHighlightRange( *pRangeEntry, aColName );
}
@@ -315,7 +315,7 @@ void ScFormulaReferenceHelper::ReleaseFocus( formula::RefEdit* pEdit, formula::R
{
if ( !aRangeList.empty() )
{
- const ScRangePtr pRange = aRangeList.front();
+ const ScRange* pRange = aRangeList.front();
pViewShell->SetTabNo( pRange->aStart.Tab() );
pViewShell->MoveCursorAbs( pRange->aStart.Col(),
pRange->aStart.Row(), SC_FOLLOW_JUMP, FALSE, FALSE );
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 8e9ebee..604dc5a 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3144,7 +3144,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ScChart2DataSequence::generateLabel(ch
sal_Int32 nCount = 0;
bool bFound = false;
- ScRangePtr p;
+ ScRange* p;
uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( lcl_GetSpreadSheetDocument( m_pDocument ));
if (!xSpreadDoc.is())
@@ -3499,7 +3499,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2EmptyDataSequence::getTextualDat
throw uno::RuntimeException();
sal_Int32 nCount = 0;
- ScRangePtr p;
+ ScRange* p;
DBG_ASSERT(m_xRanges->Count() == 1, "not handled count of ranges");
diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx
index b387da0..749cb33 100644
--- a/sc/source/ui/vba/vbapagesetup.cxx
+++ b/sc/source/ui/vba/vbapagesetup.cxx
@@ -116,7 +116,7 @@ void SAL_CALL ScVbaPageSetup::setPrintArea( const rtl::OUString& rAreas ) throw
uno::Sequence< table::CellRangeAddress > aSeq( aCellRanges.size() );
for ( size_t i = 0, nRanges = aCellRanges.size(); i < nRanges; ++i )
{
- ScRangePtr pRange = aCellRanges[ i ];
+ ScRange* pRange = aCellRanges[ i ];
table::CellRangeAddress aRangeAddress;
ScUnoConversion::FillApiRange( aRangeAddress, *pRange );
aSeq[ i++ ] = aRangeAddress;
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index c07cdbd..a67c68c 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1162,7 +1162,7 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S
for ( size_t i = 0, nRanges = aCellRanges.size(); i < nRanges; ++i )
{
- ScRangePtr pRange = aCellRanges[ i ];
+ ScRange* pRange = aCellRanges[ i ];
pRange->aStart.SetCol( refRange.aStart.Col() + pRange->aStart.Col() );
pRange->aStart.SetRow( refRange.aStart.Row() + pRange->aStart.Row() );
pRange->aStart.SetTab( bTabFromReferrer ? refRange.aStart.Tab() : pRange->aStart.Tab() );
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 019e741..1e93515 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -745,7 +745,7 @@ String ScViewFunc::GetAutoSumFormula( const ScRangeList& rRangeList, bool bSubTo
size_t ListSize = aRangeList.size();
for ( size_t i = 0; i < ListSize; ++i )
{
- const ScRangePtr p = aRangeList.at( i );
+ const ScRange* p = aRangeList.at( i );
if (p != pFirst)
pArray->AddOpCode(ocSep);
ScComplexRefData aRef;
@@ -998,7 +998,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint,
size_t nListSize = aList->size();
for ( size_t i = 0; i < nListSize; ++i )
{
- ScRangePtr pR = aList->at( i );
+ ScRange* pR = aList->at( i );
pDoc->AddPrintRange( nTab, *pR );
}
}
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 9d4e77d..88db7a9 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -373,7 +373,7 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
// Check for geometrical feasibility of the ranges.
bool bValidRanges = true;
- ScRangePtr p = aClipParam.maRanges.front();
+ ScRange* p = aClipParam.maRanges.front();
SCCOL nPrevColDelta = 0;
SCROW nPrevRowDelta = 0;
SCCOL nPrevCol = p->aStart.Col();
@@ -1079,7 +1079,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
size_t ListSize = aRangeList.size();
for ( size_t i = 0; i < ListSize; ++i )
{
- ScRangePtr p = aRangeList.at( i );
+ ScRange* p = aRangeList.at( i );
nUnfilteredRows += p->aEnd.Row() - p->aStart.Row() + 1;
}
#if 0
More information about the Libreoffice-commits
mailing list