diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 12:26:36 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 12:26:36 +0000 |
| commit | 688f96aa061a93774bb4d870250f20e6507315b7 (patch) | |
| tree | db7ebed46ced924055e6df93458c0e8813397f93 /sw | |
| parent | 13af423896824edb6e25798d9aa296a0d156b9be (diff) | |
INTEGRATION: CWS oasisbf2 (1.15.88); FILE MERGED
2004/11/04 15:30:27 dvo 1.15.88.1: #i31024# prevent headings with outline num-rules from being written as lists
(plus dependent changes for NO_NUM removal)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/unocore/unocrsrhelper.cxx | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index d243163a62ae..82d2da92b053 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unocrsrhelper.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: hr $ $Date: 2004-11-09 13:51:12 $ + * last change: $Author: rt $ $Date: 2004-11-26 13:26:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -231,6 +231,7 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertyMap* pMap switch(pMap->nWID) { case FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL: +#if 0 if( pAny ) { SwFmtColl* pFmt = 0; @@ -243,6 +244,20 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertyMap* pMap nRet = ((SwTxtFmtColl*)pFmt)->GetOutlineLevel(); *pAny <<= nRet; } +#endif + if (pAny) + { + const SwTxtNode * pTmpNode = pNode; + + if (!pTmpNode) + pTmpNode = rPam.GetNode()->GetTxtNode(); + + sal_Int8 nRet = -1; + if (pTmpNode && pTmpNode->GetOutlineLevel() != NO_NUMBERING) + nRet = pTmpNode->GetOutlineLevel(); + + *pAny <<= nRet; + } break; case FN_UNO_PARA_CONDITIONAL_STYLE_NAME: case FN_UNO_PARA_STYLE : |