ooo-build r15538 - trunk/patches/dev300

[cbosdo svn gnome org]

Author: cbosdo
Date: Fri Mar 13 17:22:18 2009
New Revision: 15538
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15538&view=rev

Log:
Fixed i97804


Added:
   trunk/patches/dev300/writerfilter-docx-import-i97804.diff
Modified:
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Mar 13 17:22:18 2009
@@ -1994,6 +1994,7 @@
 sw-docx-import-redlines.diff, i#91883, n#478562, cbosdo
 writerfilter-docx-import-frames-width.diff, i#93783, cbosdo
 writerfilter-docx-import-page-borders.diff, i#100176, cbosdo
+writerfilter-docx-import-i97804.diff, i#97804, cbosdo
 
 buildfix-oox-depends-on-unotools.diff
 

Added: trunk/patches/dev300/writerfilter-docx-import-i97804.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/writerfilter-docx-import-i97804.diff	Fri Mar 13 17:22:18 2009
@@ -0,0 +1,19 @@
+diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
+index 44782d4..b8180f0 100644
+--- a/writerfilter/source/dmapper/DomainMapper.cxx
++++ b/writerfilter/source/dmapper/DomainMapper.cxx
+@@ -1881,12 +1881,12 @@ void DomainMapper::attribute(Id nName, Value & val)
+             /* WRITERFILTERSTATUS: done: 80, planned: 0.5, spent: 0.2 */
+             //TODO: autospacing depends on some document property (called fDontUseHTMLAutoSpacing in old ww8 filter) 100 or 280 twip
+             //and should be set to 0 on start of page
+-            m_pImpl->GetTopContext()->Insert( PROP_TOP_MARGIN, false, uno::makeAny( AUTO_PARA_SPACING ) );
++            m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN, false, uno::makeAny( AUTO_PARA_SPACING ) );
+         break;
+         case NS_ooxml::LN_CT_Spacing_afterAutospacing:
+             /* WRITERFILTERSTATUS: done: 80, planned: 0.5, spent: 0.2 */
+             //TODO: autospacing depends on some document property (called fDontUseHTMLAutoSpacing in old ww8 filter) 100 or 280 twip
+-            m_pImpl->GetTopContext()->Insert( PROP_BOTTOM_MARGIN, false, uno::makeAny( AUTO_PARA_SPACING ) );
++            m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, false, uno::makeAny( AUTO_PARA_SPACING ) );
+         break;
+         case NS_ooxml::LN_CT_SmartTagRun_uri:
+         case NS_ooxml::LN_CT_SmartTagRun_element: