Index: src/text/ptbl/xp/pd_Style.cpp =================================================================== RCS file: /cvsroot/abi/src/text/ptbl/xp/pd_Style.cpp,v retrieving revision 1.27 diff -u -r1.27 pd_Style.cpp --- src/text/ptbl/xp/pd_Style.cpp 18 May 2005 17:05:21 -0000 1.27 +++ src/text/ptbl/xp/pd_Style.cpp 20 May 2005 08:28:54 -0000 @@ -26,7 +26,7 @@ PD_Style::PD_Style(pt_PieceTable * pPT, PT_AttrPropIndex indexAP, const char * szName) : m_pPT(pPT), m_indexAP(indexAP), m_szName(NULL), m_iUsed(0), - m_pBasedOn(NULL), m_pFollowedBy(NULL), m_iIsList(-1) + m_pBasedOn(NULL), m_pFollowedBy(NULL) { if (szName) m_szName = UT_strdup (szName); @@ -246,27 +246,13 @@ bool PD_Style::isList(void) { - if(m_iIsList == -1) - { - m_iIsList = 0; - UT_Vector vProp; - - getAllProperties(&vProp, 0); - - UT_ASSERT_HARMLESS(vProp.getItemCount()%2 == 0); - - for(UT_uint32 i = 0; i < vProp.getItemCount(); i += 2) - { - const XML_Char * szProp = (const XML_Char *) vProp.getNthItem(i); - if(!UT_strcmp(szProp, "list-style")) - { - m_iIsList = 1; - break; - } - } + const char *szListStyle = NULL; + if (getPropertyExpand("list-style", szListStyle)) { + return UT_stricmp(szListStyle, "None"); + } + else { + return FALSE; } - - return m_iIsList != 0; } PD_Style * PD_Style::getBasedOn(void) Index: src/text/ptbl/xp/pd_Style.h =================================================================== RCS file: /cvsroot/abi/src/text/ptbl/xp/pd_Style.h,v retrieving revision 1.21 diff -u -r1.21 pd_Style.h --- src/text/ptbl/xp/pd_Style.h 28 Dec 2003 14:28:33 -0000 1.21 +++ src/text/ptbl/xp/pd_Style.h 20 May 2005 08:28:54 -0000 @@ -83,9 +83,6 @@ // lazily-bound attribute caches to speed lookups PD_Style * m_pBasedOn; PD_Style * m_pFollowedBy; - -private: - UT_sint32 m_iIsList; };