summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2009-09-25 10:26:05 +0200
committerMathias Bauer <mba@openoffice.org>2009-09-25 10:26:05 +0200
commitd8d0f19821b9a0a4046519a369260e4ad5c5ee73 (patch)
tree595fc8b3bd789d25a614fb74f45e4a1374a63bd6 /sw
parent8c14f1bf6b0d2a395e6a0aac8b8733a804e4568d (diff)
parenta5ec2f2a5c5d0f38c5061e9fc090e6181563c1ae (diff)
merge changes from Linux repository
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index a86fbb309288..dfc3f8f92d94 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1134,7 +1134,6 @@ void WW8_SdrAttrIter::OutParaAttr(bool bCharAttr)
nWhich != nSlotId &&
( bCharAttr ? ( nWhich >= RES_CHRATR_BEGIN && nWhich < RES_TXTATR_END )
: ( nWhich >= RES_PARATR_BEGIN && nWhich < RES_FRMATR_END ) ) )
- 0 != ( pOut = aWW8AttrFnTab[ nWhich - RES_CHRATR_BEGIN ] ) )
{
// use always the SW-Which Id !
SfxPoolItem* pI = pItem->Clone();