Index: ie_exp_RTF_listenerWriteDoc.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_exp_RTF_listenerWriteDoc.cpp,v retrieving revision 1.172 diff -u -r1.172 ie_exp_RTF_listenerWriteDoc.cpp --- ie_exp_RTF_listenerWriteDoc.cpp 24 Aug 2005 01:48:39 -0000 1.172 +++ ie_exp_RTF_listenerWriteDoc.cpp 26 Sep 2005 14:42:16 -0000 @@ -2459,6 +2459,10 @@ // _getPropString(sCellProps,"top-style",sWork); bDrawBorder = true; + if(sWork.size() == 0) + { + _getPropString(sTableProps,"top-style",sWork) ; + } if(sWork.size()>0) { PP_PropertyMap::TypeLineStyle linestyle = PP_PropertyMap::linestyle_type(sWork.c_str()); @@ -2487,6 +2491,11 @@ m_pie->_rtf_keyword("brdrdash"); // plain border } } + else + { + m_pie->_rtf_keyword("clbrdrt"); // cell top border + m_pie->_rtf_keyword("brdrnone"); // no border + } } else @@ -2581,6 +2590,10 @@ // _getPropString(sCellProps,"left-style",sWork); bDrawBorder = true; + if(sWork.size() == 0) + { + _getPropString(sTableProps,"left-style",sWork); + } if(sWork.size()>0) { PP_PropertyMap::TypeLineStyle linestyle = PP_PropertyMap::linestyle_type(sWork.c_str()); @@ -2609,7 +2622,11 @@ m_pie->_rtf_keyword("brdrdash"); // plain border } } - + else + { + m_pie->_rtf_keyword("clbrdrl"); // cell left border + m_pie->_rtf_keyword("brdrnone"); // no border + } } else { @@ -2657,6 +2674,10 @@ // _getPropString(sCellProps,"bot-style",sWork); bDrawBorder = true; + if(sWork.size() == 0) + { + _getPropString(sTableProps,"bot-style",sWork); + } if(sWork.size()>0) { PP_PropertyMap::TypeLineStyle linestyle = PP_PropertyMap::linestyle_type(sWork.c_str()); @@ -2685,6 +2706,11 @@ m_pie->_rtf_keyword("brdrdash"); // plain border } } + else + { + m_pie->_rtf_keyword("clbrdrb"); // cell bottom border + m_pie->_rtf_keyword("brdrnone"); // no border + } } else @@ -2733,6 +2759,10 @@ // _getPropString(sCellProps,"right-style",sWork); bDrawBorder = true; + if(sWork.size() == 0) + { + _getPropString(sTableProps,"right-style",sWork); + } if(sWork.size()>0) { PP_PropertyMap::TypeLineStyle linestyle = PP_PropertyMap::linestyle_type(sWork.c_str()); @@ -2761,6 +2791,11 @@ m_pie->_rtf_keyword("brdrdash"); // plain border } } + else + { + m_pie->_rtf_keyword("clbrdrr"); // cell right border + m_pie->_rtf_keyword("brdrnone"); // no border + } } else