[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ac00b2881824ebd40bfcb2b20c70df6d21daf677
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Jun 22 18:55:15 2012 +0200

    fdo#46966 dmapper: fix headery/footery default value
    
    The docx spec doesn't say what is the default value, the rtf spec says
    it's 720, not 1440.
    
    Change-Id: Icb331591d4f2f96a7786f808d99af5974e645f8e

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 13abcad..0f9af17 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3394,7 +3394,8 @@ void DomainMapper_Impl::SetPageMarginTwip( PageMarElement eElement, sal_Int32 nV
 
 _PageMar::_PageMar()
 {
-    header = footer = top = bottom = ConversionHelper::convertTwipToMM100( sal_Int32(1440));
+    header = footer = ConversionHelper::convertTwipToMM100(sal_Int32(720));
+    top = bottom = ConversionHelper::convertTwipToMM100( sal_Int32(1440));
     right = left = ConversionHelper::convertTwipToMM100( sal_Int32(1800));
     gutter = 0;
 }