strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use boost::ptr_list for list containing heap objects.

Browse source
This commit is contained in:
Kohei Yoshida 2011-03-11 01:19:53 -05:00
parent f40f777986
commit 50da3d1e56
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sc/source/filter/xml/xmlimprt.cxx
View file

@ -2791,7 +2791,7 @@ void ScXMLImport::SetNamedRanges()
{
sal_Int32 nOffset = 0;
bool bSuccess = ScRangeStringConverter::GetAddressFromString(
aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), FormulaGrammar::CONV_OOO, nOffset);
aCellAddress, aItr->sBaseCellAddress, GetDocument(), FormulaGrammar::CONV_OOO, nOffset);
if (!bSuccess)
// Conversion of base cell address failed. Skip this.
@ -2800,7 +2800,7 @@ void ScXMLImport::SetNamedRanges()
try
{
xNamedRanges->addNewByName(
(*aItr)->sName, sTempContent, aCellAddress, GetRangeType((*aItr)->sRangeType));
aItr->sName, sTempContent, aCellAddress, GetRangeType(aItr->sRangeType));
}
catch( uno::RuntimeException& )
{
@ -2811,7 +2811,7 @@ void ScXMLImport::SetNamedRanges()
sal_Int32 nMax = xIndex->getCount();
bool bInserted = false;
sal_Int32 nCount = 1;
OUStringBuffer sName((*aItr)->sName);
OUStringBuffer sName(aItr->sName);
sName.append(sal_Unicode('_'));
while (!bInserted && nCount <= nMax)
{
@ -2821,7 +2821,7 @@ void ScXMLImport::SetNamedRanges()
{
xNamedRanges->addNewByName(
sTemp.makeStringAndClear(), sTempContent, aCellAddress,
GetRangeType((*aItr)->sRangeType));
GetRangeType(aItr->sRangeType));
bInserted = true;
}
catch( uno::RuntimeException& )
@ -2839,24 +2839,23 @@ void ScXMLImport::SetNamedRanges()
{
sal_Int32 nOffset(0);
if (ScRangeStringConverter::GetAddressFromString(
aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), FormulaGrammar::CONV_OOO, nOffset ))
aCellAddress, aItr->sBaseCellAddress, GetDocument(), FormulaGrammar::CONV_OOO, nOffset ))
{
uno::Reference <sheet::XNamedRange> xNamedRange(xNamedRanges->getByName((*aItr)->sName), uno::UNO_QUERY);
uno::Reference <sheet::XNamedRange> xNamedRange(xNamedRanges->getByName(aItr->sName), uno::UNO_QUERY);
if (xNamedRange.is())
{
ScXMLImport::MutexGuard aGuard(*this);
ScNamedRangeObj* pNamedRangeObj = ScNamedRangeObj::getImplementation( xNamedRange);
if (pNamedRangeObj)
{
sTempContent = (*aItr)->sContent;
sTempContent = aItr->sContent;
// Get rid of leading sheet dots in simple ranges.
if (!(*aItr)->bIsExpression)
if (!aItr->bIsExpression)
ScXMLConverter::ParseFormula( sTempContent, false);
pNamedRangeObj->SetContentWithGrammar( sTempContent, (*aItr)->eGrammar);
pNamedRangeObj->SetContentWithGrammar( sTempContent, aItr->eGrammar);
}
}
}
delete *aItr;
aItr = pNamedExpressions->erase(aItr);
}
}

10
sc/source/filter/xml/xmlimprt.hxx
View file

@ -54,6 +54,7 @@
#include <vector>
#include <boost/unordered_map.hpp>
#include <boost/ptr_container/ptr_list.hpp>
class ScRangeList;
class ScMyStyleNumberFormats;
@ -632,7 +633,7 @@ struct ScMyNamedExpression
sal_Bool bIsExpression;
};
typedef std::list<const ScMyNamedExpression*> ScMyNamedExpressions;
typedef ::boost::ptr_list<ScMyNamedExpression> ScMyNamedExpressions;
struct ScMyLabelRange
{
@ -908,10 +909,13 @@ public:
const SvXMLTokenMap& GetDataPilotMemberAttrTokenMap();
const SvXMLTokenMap& GetConsolidationAttrTokenMap();
void AddNamedExpression(const ScMyNamedExpression* pMyNamedExpression) {
void AddNamedExpression(ScMyNamedExpression* pMyNamedExpression)
{
if (!pMyNamedExpressions)
pMyNamedExpressions = new ScMyNamedExpressions();
pMyNamedExpressions->push_back(pMyNamedExpression); }
pMyNamedExpressions->push_back(pMyNamedExpression);
}
ScMyNamedExpressions* GetNamedExpressions() { return pMyNamedExpressions; }
void AddLabelRange(const ScMyLabelRange* pMyLabelRange) {

4
sc/source/filter/xml/xmlnexpi.cxx
View file

@ -77,6 +77,10 @@ void ScXMLNamedExpressionsContext::SheetLocalInserter::insert(ScMyNamedExpressio
if (bSuccess)
{
::rtl::OUString aContent = p->sContent;
if (!p->bIsExpression)
ScXMLConverter::ParseFormula(aContent, false);
ScRangeData* pData = new ScRangeData(
mpDoc, p->sName, p->sContent, aPos, RT_NAME, p->eGrammar);
pData->SetIndex(-1);