summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2013-11-22 23:37:59 +0100
committerMatteo Casalin <matteo.casalin@yahoo.com>2013-11-23 14:20:39 +0100
commit9497b37373dee60485aa3ae8983b8b4d32f936b0 (patch)
treea7e7c18b85867e872a298c5157e49c0367242bb4
parent686edf1a795b79fcbe8f97b63d81e0536ba18d90 (diff)
Reduce scope
Change-Id: Ic04a48c1a1230824b9676a6d7615b2eb39608985
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 10b97cc05341..ad7595919811 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1185,12 +1185,11 @@ void MSWord_SdrAttrIter::OutAttr( sal_Int32 nSwPos )
const SfxItemPool& rDstPool = m_rExport.pDoc->GetAttrPool();
nTmpSwPos = nSwPos;
- sal_uInt16 nWhich, nSlotId;
for(std::vector<EECharAttrib>::const_iterator i = aTxtAtrArr.begin(); i < aTxtAtrArr.end(); ++i)
{
if (nSwPos >= i->nStart && nSwPos < i->nEnd)
{
- nWhich = i->pAttr->Which();
+ sal_uInt16 nWhich = i->pAttr->Which();
if (nWhich == EE_FEATURE_FIELD)
{
OutEEField(*(i->pAttr));
@@ -1201,8 +1200,8 @@ void MSWord_SdrAttrIter::OutAttr( sal_Int32 nSwPos )
m_rExport.WriteChar(0x9);
continue;
}
- nSlotId = pSrcPool->GetSlotId(nWhich);
+ const sal_uInt16 nSlotId = pSrcPool->GetSlotId(nWhich);
if (nSlotId && nWhich != nSlotId)
{
nWhich = rDstPool.GetWhich(nSlotId);