[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - python/Python-aix.patch writerfilter/source

[Michael Stahl]

 python/Python-aix.patch                     |    3 ++-
 writerfilter/source/dmapper/PropertyMap.cxx |   15 ++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit c67e6375be1ae303fd57a24ef28ca4e232917379
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Wed Apr 11 09:45:53 2012 +0200

    fdo#44176 dmapper: fix import of titlepg top/bottom margin
    
    (backport of b0edaff7e2d885f80e96277967bfe29664c83df1)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index e74e784..4f03839 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -788,9 +788,18 @@ void SectionPropertyMap::PrepareHeaderFooterProperties( bool bFirstPage )
         operator[]( PropertyDefinition( PROP_FOOTER_BODY_DISTANCE, false )) = uno::makeAny( m_nHeaderBottom );
     }
 
-    //now set the top/bottom margin for the follow page style
-    operator[]( PropertyDefinition( PROP_TOP_MARGIN, false )) = uno::makeAny( m_nTopMargin );
-    operator[]( PropertyDefinition( PROP_BOTTOM_MARGIN, false )) = uno::makeAny( m_nBottomMargin );
+    //now set the top/bottom margin
+    sal_Int32 nHeaderHeight = 0, nFooterHeight = 0;
+    if (bFirstPage)
+    {
+        // make sure the height of the header/footer is added to the top/bottom margin if necessary
+        if (m_aFollowPageStyle.is() && !HasHeader(true) && HasHeader(false))
+            m_aFollowPageStyle->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderHeight"))) >>= nHeaderHeight;
+        if (m_aFollowPageStyle.is() && !HasFooter(true) && HasFooter(false))
+            m_aFollowPageStyle->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterHeight"))) >>= nFooterHeight;
+    }
+    operator[]( PropertyDefinition( PROP_TOP_MARGIN, false )) = uno::makeAny( m_nTopMargin + nHeaderHeight );
+    operator[]( PropertyDefinition( PROP_BOTTOM_MARGIN, false )) = uno::makeAny( m_nBottomMargin + nFooterHeight );
 }
 
 
commit 89dd8bc04bb3f311c16e9b244e7dc02d1052d06a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jan 2 10:04:57 2012 +0100

    Linux LD_LIBRARY_PATH is missing as well.
    (cherry picked from commit 7d8f3b19c69e741175bed035681cfacd3a30713d)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/python/Python-aix.patch b/python/Python-aix.patch
index 8dae6d1..9c8f601 100644
--- a/python/Python-aix.patch
+++ b/python/Python-aix.patch
@@ -12,10 +12,11 @@
  		$(LN) -f $(INSTSONAME) $@; \
  	else\
  		$(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
-@@ -907,6 +907,7 @@
+@@ -907,6 +907,8 @@
  	export PATH; PATH="`pwd`:$$PATH"; \
  	export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
  	export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
++	export LD_LIBRARY_PATH; LD_LIBRARY_PATH="`pwd`${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"; \
 +	export LIBPATH; LIBPATH="`pwd`${LIBPATH:+:$LIBPATH}"; \
  	export EXE; EXE="$(BUILDEXE)"; \
  	cd $(srcdir)/Lib/$(PLATDIR); ./regen