diff options
author | Martin Gallwey <mtg@openoffice.org> | 2001-08-16 11:33:56 +0000 |
---|---|---|
committer | Martin Gallwey <mtg@openoffice.org> | 2001-08-16 11:33:56 +0000 |
commit | f3909d4114ab54fd2ee3b71da0777fad9a4a3ee8 (patch) | |
tree | cf8571c215119faa814af020f2114949ee40d94b /sw/source/core/unocore/unocrsrhelper.cxx | |
parent | 0515bcff73418b6ec8204fe4176132ae4349c94f (diff) |
#90968# use SwStyleNameMapper methods which disambiguate user defined styles which clash with programmatic names
Diffstat (limited to 'sw/source/core/unocore/unocrsrhelper.cxx')
-rw-r--r-- | sw/source/core/unocore/unocrsrhelper.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 4da09b526cb9..add198f3f116 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.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mtg $ $Date: 2001-07-19 16:32:02 $ + * last change: $Author: mtg $ $Date: 2001-08-16 12:15:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -248,7 +248,8 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertyMap* pMap { if( pAny ) { - String sVal = SwStyleNameMapper::GetProgName(pFmt->GetName(), GET_POOLID_TXTCOLL ); + String sVal; + SwStyleNameMapper::FillProgName(pFmt->GetName(), sVal, GET_POOLID_TXTCOLL, sal_True ); *pAny <<= OUString(sVal); } } @@ -644,7 +645,7 @@ String GetCurPageStyle(SwPaM& rPaM) const SwPageFrm* pPage = rPaM.GetCntntNode()->GetFrm()->FindPageFrm(); if(pPage) { - sRet = SwStyleNameMapper::GetProgName( pPage->GetPageDesc()->GetName(), GET_POOLID_PAGEDESC ); + SwStyleNameMapper::FillProgName( pPage->GetPageDesc()->GetName(), sRet, GET_POOLID_PAGEDESC, sal_True ); } return sRet; } |