[Libreoffice-commits] .: writerfilter/source

Miklos Vajna vmiklos at kemper.freedesktop.org
Wed Apr 25 03:16:32 PDT 2012


 writerfilter/source/dmapper/PropertyMap.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 5f32957bc31a4676f2321c5a9a9e6945490861e4
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Wed Apr 25 12:16:52 2012 +0200

    use PropNameSupplier in SectionPropertyMap::PrepareHeaderFooterProperties()

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 72b92b3..42cac7d 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -783,11 +783,12 @@ void SectionPropertyMap::PrepareHeaderFooterProperties( bool bFirstPage )
     sal_Int32 nHeaderHeight = 0, nFooterHeight = 0;
     if (bFirstPage)
     {
+        PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
         // 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("HeaderHeight") >>= nHeaderHeight;
+            m_aFollowPageStyle->getPropertyValue(rPropNameSupplier.GetName(PROP_HEADER_HEIGHT)) >>= nHeaderHeight;
         if (m_aFollowPageStyle.is() && !HasFooter(true) && HasFooter(false))
-            m_aFollowPageStyle->getPropertyValue("FooterHeight") >>= nFooterHeight;
+            m_aFollowPageStyle->getPropertyValue(rPropNameSupplier.GetName(PROP_FOOTER_HEIGHT)) >>= nFooterHeight;
     }
     operator[]( PropertyDefinition( PROP_TOP_MARGIN, false )) = uno::makeAny( m_nTopMargin + nHeaderHeight );
     operator[]( PropertyDefinition( PROP_BOTTOM_MARGIN, false )) = uno::makeAny( m_nBottomMargin + nFooterHeight );


More information about the Libreoffice-commits mailing list