You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2012/08/30 10:28:53 UTC
svn commit: r1378848 -
/incubator/ooo/trunk/main/writerfilter/source/dmapper/PropertyMap.cxx
Author: af
Date: Thu Aug 30 08:28:53 2012
New Revision: 1378848
URL: http://svn.apache.org/viewvc?rev=1378848&view=rev
Log:
#i119592# Fixed column widths.
Reported by: xiao ting xiao
Patch by: wujinlong@...
Reviewed by: Andre Fischer
Modified:
incubator/ooo/trunk/main/writerfilter/source/dmapper/PropertyMap.cxx
Modified: incubator/ooo/trunk/main/writerfilter/source/dmapper/PropertyMap.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/writerfilter/source/dmapper/PropertyMap.cxx?rev=1378848&r1=1378847&r2=1378848&view=diff
==============================================================================
--- incubator/ooo/trunk/main/writerfilter/source/dmapper/PropertyMap.cxx (original)
+++ incubator/ooo/trunk/main/writerfilter/source/dmapper/PropertyMap.cxx Thu Aug 30 08:28:53 2012
@@ -566,7 +566,7 @@ uno::Reference< text::XTextColumns > Sec
uno::Reference< beans::XPropertySet > xColumnPropSet( xColumns, uno::UNO_QUERY_THROW );
if( !m_bEvenlySpaced &&
(sal_Int32(m_aColWidth.size()) == (m_nColumnCount + 1 )) &&
- (sal_Int32(m_aColDistance.size()) == m_nColumnCount))
+ ((sal_Int32(m_aColDistance.size()) == m_nColumnCount) || (sal_Int32(m_aColDistance.size()) == m_nColumnCount + 1)) )
{
//the column width in word is an absolute value, in OOo it's relative
//the distances are both absolute