diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-09-25 09:48:46 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-09-25 09:48:46 +0000 |
| commit | cdbaf64a262f40d542b75cb4dad2e2a3d1123dca (patch) | |
| tree | e7e9a11b9fc22cc97ad26e7591c1a59a7d1dbe35 /sw/source/core | |
| parent | 8cb58a78dfa808622ed6dfa14c927a881b7d5c4f (diff) | |
INTEGRATION: CWS os20 (1.25.2); FILE MERGED
2003/09/17 13:08:57 os 1.25.2.2: RESYNC: (1.25-1.26); FILE MERGED
2003/09/12 11:22:57 os 1.25.2.1: #i3961# creating tables of objects fixed: internal OLE objects were not included as soon as external objects were included into the table
Diffstat (limited to 'sw/source/core')
| -rw-r--r-- | sw/source/core/doc/doctxm.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 413d42ba8aad..7b411a3b3525 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: doctxm.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: kz $ $Date: 2003-09-11 09:39:48 $ + * last change: $Author: hjs $ $Date: 2003-09-25 10:48:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1694,9 +1694,8 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eType, { const SotFactory* pFact = rOLEObj.GetOleRef()->GetSvFactory(); long nObj = ::lcl_IsSOObject( *pFact ); - bInclude = ( nOLEOptions & TOO_OTHER ) - ? 0 == nObj - : 0 != (nOLEOptions & nObj); + bInclude = ( (nOLEOptions & TOO_OTHER) && 0 == nObj) + || (0 != (nOLEOptions & nObj)); } else { |