diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-08 12:54:32 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-08 12:54:32 +0000 |
| commit | 917bffa5f1724acfa17c38990fcffc402cafaa67 (patch) | |
| tree | be96a60603e323956e1c7bc2fc4e8ae2a85c9291 /sw/source/core/unocore | |
| parent | 03f8c64dc9ea3dc47ee3518d004c3e00aa35c383 (diff) | |
INTEGRATION: CWS swqbugfixes15 (1.86.140); FILE MERGED
2005/02/08 06:50:26 fme 1.86.140.1: #i20848# Use GetSpecialExtra*Name routines for SetExpr-fields
Diffstat (limited to 'sw/source/core/unocore')
| -rw-r--r-- | sw/source/core/unocore/unofield.cxx | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index c7b401a9bdcd..b6b39ceefaba 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unofield.cxx,v $ * - * $Revision: 1.87 $ + * $Revision: 1.88 $ * - * last change: $Author: vg $ $Date: 2005-03-08 11:16:17 $ + * last change: $Author: vg $ $Date: 2005-03-08 13:54:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2557,26 +2557,10 @@ sal_uInt16 lcl_GetIdByName( String& rName, String& rTypeName ) nResId = RES_DDEFLD; else if(rTypeName.EqualsAscii("SetExpression")) { - // build indices do access programmatic names - static sal_uInt16 nIds[] = - { - RES_POOLCOLL_LABEL_DRAWING - RES_POOLCOLL_EXTRA_BEGIN, - RES_POOLCOLL_LABEL_ABB - RES_POOLCOLL_EXTRA_BEGIN, - RES_POOLCOLL_LABEL_TABLE - RES_POOLCOLL_EXTRA_BEGIN, - RES_POOLCOLL_LABEL_FRAME - RES_POOLCOLL_EXTRA_BEGIN, - 0 - }; - const SvStringsDtor& rExtraArr = SwStyleNameMapper::GetExtraProgNameArray(); - nResId = RES_SETEXPFLD; String sFldTypName( rName.GetToken( 1, '.' )); - String sUIName( sFldTypName ); - if (*rExtraArr[ nIds[0] ] == sUIName || - *rExtraArr[ nIds[1] ] == sUIName || - *rExtraArr[ nIds[2] ] == sUIName || - *rExtraArr[ nIds[3] ] == sUIName) - sUIName = SwStyleNameMapper::GetUIName( sFldTypName, GET_POOLID_TXTCOLL ); + String sUIName( SwStyleNameMapper::GetSpecialExtraUIName( sFldTypName ) ); if( sUIName != sFldTypName ) rName.SetToken( 1, '.', sUIName ); @@ -2646,8 +2630,7 @@ sal_Bool SwXTextFieldMasters::getInstanceName( case RES_SETEXPFLD: rName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( COM_TEXT_FLDMASTER )); rName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "SetExpression.")); - rName += String(SwStyleNameMapper::GetProgName( rFldType.GetName(), - GET_POOLID_TXTCOLL )); + rName += String( SwStyleNameMapper::GetSpecialExtraProgName( rFldType.GetName() ) ); break; case RES_DBFLD: |