summaryrefslogtreecommitdiff
path: root/sc/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter')
-rw-r--r--sc/source/filter/excel/read.cxx4
-rw-r--r--sc/source/filter/excel/xecontent.cxx4
-rw-r--r--sc/source/filter/excel/xichart.cxx12
-rw-r--r--sc/source/filter/excel/xicontent.cxx16
-rw-r--r--sc/source/filter/html/htmlpars.cxx10
-rw-r--r--sc/source/filter/inc/xcl97esc.hxx2
-rw-r--r--sc/source/filter/inc/xecontent.hxx6
-rw-r--r--sc/source/filter/inc/xehelper.hxx2
-rw-r--r--sc/source/filter/inc/xlpivot.hxx2
-rw-r--r--sc/source/filter/xml/XMLTableShapeResizer.cxx2
-rw-r--r--sc/source/filter/xml/xmlbodyi.cxx2
-rw-r--r--sc/source/filter/xml/xmldrani.cxx8
-rw-r--r--sc/source/filter/xml/xmlsubti.cxx2
13 files changed, 72 insertions, 0 deletions
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 6d7c36c56ecd..7900d85de7ae 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -95,8 +95,10 @@ FltError ImportExcel::Read( void )
OSL_ENSURE( &aIn != NULL, "-ImportExcel::Read(): Kein Stream - wie dass?!" );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScfSimpleProgressBar > pProgress( new ScfSimpleProgressBar(
aIn.GetSvStreamSize(), GetDocShell(), STR_LOAD_DOC ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/* #i104057# Need to track a base position for progress bar calculation,
because sheet substreams may not be in order of sheets. */
@@ -821,8 +823,10 @@ FltError ImportExcel8::Read( void )
FltError eLastErr = eERR_OK;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScfSimpleProgressBar > pProgress( new ScfSimpleProgressBar(
aIn.GetSvStreamSize(), GetDocShell(), STR_LOAD_DOC ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/* #i104057# Need to track a base position for progress bar calculation,
because sheet substreams may not be in order of sheets. */
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 528408ce3d35..15aaee4d5317 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -675,7 +675,9 @@ XclExpCFImpl::XclExpCFImpl( const XclExpRoot& rRoot, const ScCondFormatEntry& rF
XclExpFormulaCompiler& rFmlaComp = GetFormulaCompiler();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > xScTokArr( mrFormatEntry.CreateTokenArry( 0 ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mxTokArr1 = rFmlaComp.CreateFormula( EXC_FMLATYPE_CONDFMT, *xScTokArr );
if( bFmla2 )
@@ -1027,7 +1029,9 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
// formulas
XclExpFormulaCompiler& rFmlaComp = GetFormulaCompiler();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > xScTokArr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// first formula
xScTokArr.reset( pValData->CreateTokenArry( 0 ) );
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index f2ffc76aca3f..d5b357f24769 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2074,7 +2074,9 @@ void XclImpChSeries::ReadChSerTrendLine( XclImpStream& rStrm )
void XclImpChSeries::ReadChSerErrorBar( XclImpStream& rStrm )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<XclImpChSerErrorBar> pErrorBar(new XclImpChSerErrorBar(GetChRoot()));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pErrorBar->ReadChSerErrorBar(rStrm);
sal_uInt8 nBarType = pErrorBar->GetBarType();
maErrorBars.insert(nBarType, pErrorBar);
@@ -2775,13 +2777,17 @@ void XclImpChTypeGroup::ReadChDropBar( XclImpStream& rStrm )
{
if (maDropBars.find(EXC_CHDROPBAR_UP) == maDropBars.end())
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<XclImpChDropBar> p(new XclImpChDropBar(EXC_CHDROPBAR_UP));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
p->ReadRecordGroup(rStrm);
maDropBars.insert(EXC_CHDROPBAR_UP, p);
}
else if(maDropBars.find(EXC_CHDROPBAR_DOWN) == maDropBars.end())
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<XclImpChDropBar> p(new XclImpChDropBar(EXC_CHDROPBAR_DOWN));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
p->ReadRecordGroup(rStrm);
maDropBars.insert(EXC_CHDROPBAR_DOWN, p);
}
@@ -3817,7 +3823,9 @@ void XclImpChChart::ReadChDefaultText( XclImpStream& rStrm )
sal_uInt16 nTextId = rStrm.ReaduInt16();
if( (rStrm.GetNextRecId() == EXC_ID_CHTEXT) && rStrm.StartNextRecord() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<XclImpChText> pText(new XclImpChText(GetChRoot()));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pText->ReadRecordGroup(rStrm);
maDefTexts.insert(nTextId, pText);
}
@@ -3967,12 +3975,16 @@ void XclImpChChart::Convert( const Reference<XChartDocument>& xChartDoc,
ScDocument& rDoc = GetRoot().GetDoc();
if( ScChartListenerCollection* pChartCollection = rDoc.GetChartListenerCollection() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::std::vector< ScTokenRef > > xRefTokens( new ::std::vector< ScTokenRef > );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
for( XclImpChSeriesVec::const_iterator aIt = maSeries.begin(), aEnd = maSeries.end(); aIt != aEnd; ++aIt )
(*aIt)->FillAllSourceLinks( *xRefTokens );
if( !xRefTokens->empty() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScChartListener > xListener( new ScChartListener( rObjName, &rDoc, xRefTokens.release() ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
xListener->SetUsed( true );
xListener->StartListeningTo();
pChartCollection->Insert( xListener.release() );
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 243d6ad87443..e4f25cfe4257 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -206,7 +206,9 @@ void lclInsertUrl( const XclImpRoot& rRoot, const String& rUrl, SCCOL nScCol, SC
rEE.QuickSetAttribs( aItemSet, ESelection( 0, 0, 0xFFFF, 0 ) );
}
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< EditTextObject > xTextObj( rEE.CreateTextObject() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
ScEditCell* pCell = new ScEditCell( xTextObj.get(), &rDoc, rEE.GetEditTextObjectPool() );
rDoc.PutCell( aScPos, pCell );
@@ -248,9 +250,11 @@ String XclImpHyperlink::ReadEmbeddedData( XclImpStream& rStrm )
OSL_ENSURE( aGuid == XclTools::maGuidStdLink, "XclImpHyperlink::ReadEmbeddedData - unknown header GUID" );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< String > xLongName; // link / file name
::std::auto_ptr< String > xShortName; // 8.3-representation of file name
::std::auto_ptr< String > xTextMark; // text mark
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// description (ignore)
if( ::get_flag( nFlags, EXC_HLINK_DESCR ) )
@@ -600,7 +604,9 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
const ScAddress& rPos = maRanges.front()->aStart; // assured above that maRanges is not empty
ExcelToSc& rFmlaConv = GetOldFmlaConverter();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > xTokArr1;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( nFmlaSize1 > 0 )
{
const ScTokenArray* pTokArr = 0;
@@ -611,7 +617,9 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
xTokArr1.reset( pTokArr->Clone() );
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > pTokArr2;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( nFmlaSize2 > 0 )
{
const ScTokenArray* pTokArr = 0;
@@ -743,7 +751,9 @@ void XclImpValidationManager::ReadDV( XclImpStream& rStrm )
// first formula
// string list is single tStr token with NUL separators -> replace them with LF
rStrm.SetNulSubstChar( '\n' );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > xTokArr1;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
rStrm >> nLen;
rStrm.Ignore( 2 );
if( nLen > 0 )
@@ -758,7 +768,9 @@ void XclImpValidationManager::ReadDV( XclImpStream& rStrm )
rStrm.SetNulSubstChar(); // back to default
// second formula
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > xTokArr2;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
rStrm >> nLen;
rStrm.Ignore( 2 );
if( nLen > 0 )
@@ -1170,7 +1182,9 @@ void XclImpDocProtectBuffer::Apply() const
// If neither is set then the document is not protected at all.
return;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScDocProtection> pProtect(new ScDocProtection);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pProtect->setProtected(true);
if (mnPassHash)
@@ -1273,7 +1287,9 @@ void XclImpSheetProtectBuffer::Apply() const
// This sheet is (for whatever reason) not protected.
continue;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScTableProtection> pProtect(new ScTableProtection);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pProtect->setProtected(true);
// 16-bit hash password
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index d85d83fcfeb0..ec64e46d2c78 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -90,7 +90,9 @@ void ScHTMLStyles::add(const char* pElemName, size_t nElemName, const char* pCla
if (itrElem == maElemProps.end())
{
// new element
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<NamePropsType> p(new NamePropsType);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
std::pair<ElemsType::iterator, bool> r = maElemProps.insert(aElem, p);
if (!r.second)
// insertion failed.
@@ -174,7 +176,9 @@ void ScHTMLStyles::insertProp(
if (itr == rStore.end())
{
// new element
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<PropsType> p(new PropsType);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
std::pair<NamePropsType::iterator, bool> r = rStore.insert(aName, p);
if (!r.second)
// insertion failed.
@@ -2182,7 +2186,9 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo )
{
// read needed options from the <td> tag
ScHTMLSize aSpanSize( 1, 1 );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<rtl::OUString> pValStr, pNumStr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
const HTMLOptions& rOptions = static_cast<HTMLParser*>(rInfo.pParser)->GetOptions();
HTMLOptions::const_iterator itr = rOptions.begin(), itrEnd = rOptions.end();
sal_uInt32 nNumberFormat = NUMBERFORMAT_ENTRY_NOT_FOUND;
@@ -2413,6 +2419,7 @@ void ScHTMLTable::CreateNewEntry( const ImportInfo& rInfo )
mxCurrEntry->aSel = rInfo.aSelection;
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
void ScHTMLTable::ImplPushEntryToList( ScHTMLEntryList& rEntryList, ScHTMLEntryPtr& rxEntry )
{
// HTML entry list does not own the entries
@@ -2420,7 +2427,9 @@ void ScHTMLTable::ImplPushEntryToList( ScHTMLEntryList& rEntryList, ScHTMLEntryP
// mrEEParseList (reference to member of ScEEParser) owns the entries
mrEEParseList.push_back( rxEntry.release() );
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
bool ScHTMLTable::PushEntry( ScHTMLEntryPtr& rxEntry )
{
bool bPushed = false;
@@ -2448,6 +2457,7 @@ bool ScHTMLTable::PushEntry( ScHTMLEntryPtr& rxEntry )
}
return bPushed;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
bool ScHTMLTable::PushEntry( const ImportInfo& rInfo, bool bLastInCell )
{
diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx
index 55f33b6033e4..df7c09d7fd63 100644
--- a/sc/source/filter/inc/xcl97esc.hxx
+++ b/sc/source/filter/inc/xcl97esc.hxx
@@ -56,8 +56,10 @@ private:
virtual SvStream* ImplQueryPictureStream();
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::utl::TempFile > mxPicTempFile;
::std::auto_ptr< SvStream > mxPicStrm;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
// ============================================================================
diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx
index 1e1b9f39b4a1..10b245f61e66 100644
--- a/sc/source/filter/inc/xecontent.hxx
+++ b/sc/source/filter/inc/xecontent.hxx
@@ -70,7 +70,9 @@ public:
virtual void SaveXml( XclExpXmlStream& rStrm );
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef ::std::auto_ptr< XclExpSstImpl > XclExpSstImplPtr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
XclExpSstImplPtr mxImpl;
};
@@ -128,8 +130,10 @@ private:
virtual void WriteBody( XclExpStream& rStrm );
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef ::std::auto_ptr< String > StringPtr;
typedef ::std::auto_ptr< SvStream > SvStreamPtr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
ScAddress maScPos; /// Position of the hyperlink.
StringPtr mxRepr; /// Cell representation text.
@@ -183,7 +187,9 @@ private:
virtual void WriteBody( XclExpStream& rStrm );
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef ::std::auto_ptr< XclExpCFImpl > XclExpCFImplPtr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
XclExpCFImplPtr mxImpl;
};
diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx
index 6f43a38d02e6..c978e774bef4 100644
--- a/sc/source/filter/inc/xehelper.hxx
+++ b/sc/source/filter/inc/xehelper.hxx
@@ -68,7 +68,9 @@ public:
void Progress();
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef ::std::auto_ptr< ScfProgressBar > ScfProgressBarPtr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
ScfProgressBarPtr mxProgress; /// Progress bar implementation.
ScfProgressBar* mpSubProgress; /// Current sub progress bar.
diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx
index 560e18a19a2b..f162f8f7f18a 100644
--- a/sc/source/filter/inc/xlpivot.hxx
+++ b/sc/source/filter/inc/xlpivot.hxx
@@ -637,7 +637,9 @@ struct XclPTFieldExtInfo
sal_uInt16 mnSortField; /// Index to data field sorting bases on.
sal_uInt16 mnShowField; /// Index to data field AutoShow bases on.
sal_uInt16 mnNumFmt;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<rtl::OUString> mpFieldTotalName;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
explicit XclPTFieldExtInfo();
diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx
index c12a421f741b..12153486dade 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.cxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx
@@ -94,7 +94,9 @@ void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc,
if (!pCollection)
return;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< vector<ScTokenRef> > pRefTokens(new vector<ScTokenRef>);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
const sal_Unicode cSep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
ScRefTokenHelper::compileRangeRepresentation(
*pRefTokens, aRangeStr, pDoc, cSep, formula::FormulaGrammar::GRAM_ENGLISH);
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index 44430d5ce758..9fe2a64c5dea 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -275,7 +275,9 @@ void ScXMLBodyContext::EndElement()
// #i37959# handle document protection after the sheet settings
if (bProtected)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDocProtection> pProtection(new ScDocProtection);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pProtection->setProtected(true);
uno::Sequence<sal_Int8> aPass;
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index d79dbed730e0..19066e0c5178 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -297,8 +297,10 @@ ScDBData* ScXMLDatabaseRangeContext::ConvertToDBData(const OUString& rName)
if (!ScRangeStringConverter::GetRangeFromString(aRange, sRangeAddress, pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset))
return NULL;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDBData> pData(
new ScDBData(rName, aRange.aStart.Tab(), aRange.aStart.Col(), aRange.aStart.Row(), aRange.aEnd.Col(), aRange.aEnd.Row()));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pData->SetAutoFilter(bAutoFilter);
pData->SetKeepFmt(bKeepFormats);
@@ -480,7 +482,9 @@ void ScXMLDatabaseRangeContext::EndElement()
if (meRangeType == ScDBCollection::SheetAnonymous)
{
OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDBData> pData(ConvertToDBData(aName));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pData.get())
{
@@ -495,7 +499,9 @@ void ScXMLDatabaseRangeContext::EndElement()
else if (meRangeType == ScDBCollection::GlobalAnonymous)
{
OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_GLOBAL_NONAME));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDBData> pData(ConvertToDBData(aName));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pData.get())
{
@@ -511,7 +517,9 @@ void ScXMLDatabaseRangeContext::EndElement()
}
else if (meRangeType == ScDBCollection::GlobalNamed)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDBData> pData(ConvertToDBData(sDatabaseRangeName));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pData.get())
{
diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx
index c40f93692aa2..f70ed4a34bbf 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -666,7 +666,9 @@ void ScMyTables::DeleteTable()
uno::Sequence<sal_Int8> aHash;
SvXMLUnitConverter::decodeBase64(aHash, maProtectionData.maPassword);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScTableProtection> pProtect(new ScTableProtection);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pProtect->setProtected(maProtectionData.mbProtected);
pProtect->setPasswordHash(aHash, maProtectionData.meHash1, maProtectionData.meHash2);
pProtect->setOption(ScTableProtection::SELECT_LOCKED_CELLS, maProtectionData.mbSelectProtectedCells);