writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 84feec943a09aadd73cd75e80446a73fa8bdc3c9
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Jun 22 18:44:49 2014 +0200
error: enumeral and non-enumeral type in conditional expression
Change-Id: I97600b95d1d5acfd6ace83585bb77469d53d1705
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8b1ea55..c2e357e1 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -877,7 +877,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
pFrameProperties[10].Value <<= text::WrapTextMode(
rAppendContext.pLastParagraphProperties->GetWrap() >= 0 ?
rAppendContext.pLastParagraphProperties->GetWrap() :
- pStyleProperties->GetWrap() >= 0 ?
pStyleProperties->GetWrap() : text::WrapTextMode_NONE );
+ pStyleProperties->GetWrap() >= 0 ?
pStyleProperties->GetWrap() : 0 );
/** FDO#73546 : distL & distR should be unsigned intgers <Ecma
20.4.3.6>
Swapped the array elements 11,12 & 13,14 since 11 & 12 are
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
