summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-05-07 16:58:32 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-05-08 09:56:22 +0100
commit791f3f9db94c0b849f517cbda3878f2d156dbca7 (patch)
tree376104dbc9321615ab5b02c66431ebdf4eca372b
parentf6012f6c5d40857ea7a9490da90ae5541d859563 (diff)
coverity#1209146 Logically dead code
Change-Id: I6777dffb436471b5df69d40a15bd32b473dcfc40
-rw-r--r--sw/source/core/tox/tox.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 1b1024d8b1ab..abcfc80747c9 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -417,10 +417,9 @@ void SwForm::AdjustTabStops( SwDoc& rDoc ) // #i21237#
continue;
}
- const SvxTabStopItem* pTabStops = pColl != NULL ? &pColl->GetTabStops(false) : 0;
- const sal_uInt16 nTabCount = pTabStops != NULL ? pTabStops->Count() : 0;
- if( pTabStops != NULL
- && nTabCount != 0 )
+ const SvxTabStopItem& rTabStops = pColl->GetTabStops(false);
+ const sal_uInt16 nTabCount = rTabStops.Count();
+ if (nTabCount != 0)
{
SwFormTokens aCurrentPattern = GetPattern(nLevel);
SwFormTokens::iterator aIt = aCurrentPattern.begin();
@@ -428,7 +427,7 @@ void SwForm::AdjustTabStops( SwDoc& rDoc ) // #i21237#
bool bChanged = false;
for(sal_uInt16 nTab = 0; nTab < nTabCount; ++nTab)
{
- const SvxTabStop& rTab = (*pTabStops)[nTab];
+ const SvxTabStop& rTab = rTabStops[nTab];
if ( rTab.GetAdjustment() == SVX_TAB_ADJUST_DEFAULT )
continue; // ignore the default tab stop