diff options
author | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-12-02 21:43:05 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-12-05 19:25:11 -0500 |
commit | a39ed5f75577af80fc77650f1185b326e07b2059 (patch) | |
tree | 1954af4c23d94283c68320f7d87d7083f48f254f /sc | |
parent | df46bad0d1db25a6530da597242c7b9df1d3dd82 (diff) |
Let's not create unnecessary duplidate.
These ref tokens are only read, not modified. Taking a const reference
is sufficient.
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/unoobj/chart2uno.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 53ffed804e94..2dc8b36949bc 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -454,7 +454,7 @@ class Chart2Positioner public: Chart2Positioner(ScDocument* pDoc, const vector<ScTokenRef>& rRefTokens) : - mpRefTokens(new vector<ScTokenRef>(rRefTokens)), + mrRefTokens(rRefTokens), mpPositionMap(NULL), meGlue(GLUETYPE_NA), mpDoc(pDoc), @@ -491,7 +491,7 @@ private: void createPositionMap(); private: - shared_ptr< vector<ScTokenRef> > mpRefTokens; + const vector<ScTokenRef>& mrRefTokens; SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<Chart2PositionMap> mpPositionMap; SAL_WNODEPRECATED_DECLARATIONS_POP @@ -516,9 +516,9 @@ void Chart2Positioner::glueState() return; mbDummyUpperLeft = false; - if (mpRefTokens->size() <= 1) + if (mrRefTokens.size() <= 1) { - const ScTokenRef& p = mpRefTokens->front(); + const ScTokenRef& p = mrRefTokens.front(); ScComplexRefData aData; if (ScRefTokenHelper::getDoubleRefDataFromToken(aData, p)) { @@ -539,13 +539,13 @@ void Chart2Positioner::glueState() } ScComplexRefData aData; - ScRefTokenHelper::getDoubleRefDataFromToken(aData, mpRefTokens->front()); + ScRefTokenHelper::getDoubleRefDataFromToken(aData, mrRefTokens.front()); mnStartCol = aData.Ref1.nCol; mnStartRow = aData.Ref1.nRow; SCCOL nMaxCols = 0, nEndCol = 0; SCROW nMaxRows = 0, nEndRow = 0; - for (vector<ScTokenRef>::const_iterator itr = mpRefTokens->begin(), itrEnd = mpRefTokens->end() + for (vector<ScTokenRef>::const_iterator itr = mrRefTokens.begin(), itrEnd = mrRefTokens.end() ; itr != itrEnd; ++itr) { ScRefTokenHelper::getDoubleRefDataFromToken(aData, *itr); @@ -609,7 +609,7 @@ void Chart2Positioner::glueState() const sal_uInt8 nGlue = 3; vector<sal_uInt8> aCellStates(nCR); - for (vector<ScTokenRef>::const_iterator itr = mpRefTokens->begin(), itrEnd = mpRefTokens->end(); + for (vector<ScTokenRef>::const_iterator itr = mrRefTokens.begin(), itrEnd = mrRefTokens.end(); itr != itrEnd; ++itr) { ScRefTokenHelper::getDoubleRefDataFromToken(aData, *itr); @@ -713,7 +713,7 @@ void Chart2Positioner::createPositionMap() SAL_WNODEPRECATED_DECLARATIONS_POP Table* pCol = NULL; SCROW nNoGlueRow = 0; - for (vector<ScTokenRef>::const_iterator itr = mpRefTokens->begin(), itrEnd = mpRefTokens->end(); + for (vector<ScTokenRef>::const_iterator itr = mrRefTokens.begin(), itrEnd = mrRefTokens.end(); itr != itrEnd; ++itr) { const ScTokenRef& pToken = *itr; |