INTEGRATION: CWS hb10 (1.190.100); FILE MERGED

2008/08/29 14:25:50 hbrinkm 1.190.100.3: RESYNC: (1.196-1.197); FILE MERGED
2008/07/17 13:37:13 hbrinkm 1.190.100.2: RESYNC: (1.190-1.196); FILE MERGED
2008/06/18 12:05:28 hbrinkm 1.190.100.1: #i56856# applied patch
This commit is contained in:
Rüdiger Timm 2008-09-04 08:34:33 +00:00
parent 43b1956ea6
commit f52e23f112

View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ww8par.cxx,v $
* $Revision: 1.197 $
* $Revision: 1.198 $
*
* This file is part of OpenOffice.org.
*
@ -1445,7 +1445,7 @@ void SwWW8ImplReader::ImportDop()
// <--
// --> FME 2005-06-08 #i49277#
rDoc.set(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK, false);
rDoc.set(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK, !pWDop->fExpShRtn); // #i56856#
// --> FME 2005-08-11 #i53199#
rDoc.set(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT, false);