mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS swqcore06 (1.82.38); FILE MERGED

Browse Source 
2005/02/10 13:15:17 hbrinkm 1.82.38.2: RESYNC: (1.82-1.83); FILE MERGED
2005/02/07 21:03:07 dvo 1.82.38.1: #i42220# fix NUMBERING_IS_NUMBER property
This commit is contained in:
Vladimir Glazounov
2005-02-22 09:03:29 +00:00
parent 6d47d86734
commit bd8b53e120
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sw/source/core/unocore/unoobj.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: unoobj.cxx,v $
*
* $Revision: 1.83 $
* $Revision: 1.84 $
*
* last change: $Author: obo $ $Date: 2005-01-25 14:00:20 $
* last change: $Author: vg $ $Date: 2005-02-22 10:03:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -760,9 +760,10 @@ sal_Bool lcl_setCrsrPropertyValue(const SfxItemPropertyMap* pMap,
SwTxtNode* pTxtNd = rPam.GetNode()->GetTxtNode();
const SwNumRule* pRule = pTxtNd->GetNumRule();
// hier wird Multiselektion nicht beruecksichtigt
if( pRule && pTxtNd->GetNum())
if( pTxtNd->GetNum() )
{
if( FN_UNO_NUM_LEVEL == pMap->nWID)
if( FN_UNO_NUM_LEVEL == pMap->nWID && pRule != NULL )
{
sal_Int16 nLevel;
aValue >>= nLevel;
@@ -788,7 +789,7 @@ sal_Bool lcl_setCrsrPropertyValue(const SfxItemPropertyMap* pMap,
}
#endif
}
else
else if( FN_UNO_IS_NUMBER == pMap->nWID )
{
BOOL bIsNumber = *(sal_Bool*) aValue.getValue();
SwNodeNum aNum = *pTxtNd->GetNum();