summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorRelease Engineers <releng@openoffice.org>2009-07-03 09:36:46 +0000
committerRelease Engineers <releng@openoffice.org>2009-07-03 09:36:46 +0000
commitd766cc1c9eb41f85eb47e00a7091df1d7d4baf46 (patch)
tree35daae318eafa9cfb2a73e8f86936088af17c3b6 /sw/source
parent8dd4265b9ddbd7786b6237676909eae5b540da0e (diff)
#i10000# fix for hb18 merge
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 6c9a206e0f9c..19158b981a4e 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -282,12 +282,10 @@ void SwWW8Writer::ExportPoolItemsToCHP(sw::PoolItems &rItems, USHORT nScript)
{
const SfxPoolItem *pItem = aI->second;
USHORT nWhich = pItem->Which();
- if (nWhich < RES_CHRATR_BEGIN || nWhich >= RES_TXTATR_END)
+ if (!isCHRATR(nWhich) && !isTXTATR(nWhich))
continue;
if (FnAttrOut pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN])
{
- if (!isCHRATR(nWhich) && !isTXTATR(nWhich))
- continue;
if (SwWW8Writer::CollapseScriptsforWordOk(nScript, nWhich))
(*pOut)(*this, *pItem);
}