diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-04 19:25:02 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-05 15:21:07 -0500 |
| commit | 9b6c3f27f441099a4d07f8ecc3845e3fde46e992 (patch) | |
| tree | d188ad0f516850bffca1785f043a75544ad54a68 /sc/source/ui/docshell | |
| parent | 0df4b4a86073690ea9013645a39631289ea609a5 (diff) | |
Identified and tagged all places where I need to modify.
Diffstat (limited to 'sc/source/ui/docshell')
| -rw-r--r-- | sc/source/ui/docshell/dbdocfun.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 0dec37d1e581..96228b2256f3 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -326,7 +326,7 @@ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi ) // DB- und andere Bereiche ScRangeName* pDocRange = pDoc->GetRangeName(); - if (pDocRange->GetCount()) + if (!pDocRange->empty()) pUndoRange = new ScRangeName( *pDocRange ); ScDBCollection* pDocDB = pDoc->GetDBCollection(); if (pDocDB->GetCount()) @@ -1078,7 +1078,7 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, // DB- und andere Bereiche ScRangeName* pDocRange = pDoc->GetRangeName(); - if (pDocRange->GetCount()) + if (!pDocRange->empty()) pUndoRange = new ScRangeName( *pDocRange ); ScDBCollection* pDocDB = pDoc->GetDBCollection(); if (pDocDB->GetCount()) diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 66b2a5b6d853..ea2722675ee8 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -4690,15 +4690,18 @@ BOOL ScDocFunc::InsertNameList( const ScAddress& rStartPos, BOOL bApi ) ScDocument* pUndoDoc = NULL; ScRangeName* pList = pDoc->GetRangeName(); - USHORT nCount = pList->GetCount(); USHORT nValidCount = 0; USHORT i; + USHORT nCount = pList->size(); +#if NEW_RANGE_NAME +#else for (i=0; i<nCount; i++) { ScRangeData* pData = (*pList)[i]; if ( !pData->HasType( RT_DATABASE ) && !pData->HasType( RT_SHARED ) ) ++nValidCount; } +#endif if (nValidCount) { |