strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge error fixed

Browse source
This commit is contained in:
Oliver Specht 2007-06-19 07:17:07 +00:00
parent 9021a853e0
commit 88e21221d3
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
writerfilter/source/dmapper/StyleSheetTable.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: StyleSheetTable.cxx,v $
*
* $Revision: 1.25 $
* $Revision: 1.26 $
*
* last change: $Author: os $ $Date: 2007-06-18 12:31:12 $
* last change: $Author: os $ $Date: 2007-06-19 08:17:07 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -584,7 +584,6 @@ void StyleSheetTable::attribute(doctok::Id Name, doctok::Value & val)
// case NS_rtf::LN_LFOTABLE: break;
// case NS_rtf::LN_StyleSheetTable: break;
// case NS_rtf::LN_STYLESHEET: break;
break;
case NS_ooxml::LN_CT_Style_type:
if (nIntValue == 1)
*(m_pImpl->m_pCurrentEntry->pProperties) = *(m_pImpl->m_pDefaultParaProps);