[Libreoffice-commits] .: 2 commits - lotuswordpro/source

[David Tardon]

 lotuswordpro/source/filter/lwpobjid.cxx            |    2 +-
 lotuswordpro/source/filter/xfilter/xfparastyle.hxx |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 580ee28500128b2c7b8078cd36a84f38d1c50ec8
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Dec 23 11:15:31 2010 +0100

    fix use of temporary value

diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
index fde03ae..ead40ff 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
@@ -235,10 +235,7 @@ public:
 
     sal_uInt32 GetFlag(){ return m_nFlag; }
 
-    /**
-     * @descr	return margins.
-     */
-    XFMargins GetMargins(){return m_aMargin;}
+    XFMargins& GetMargins(){return m_aMargin;}
 
     virtual enumXFStyle	GetStyleFamily();
 
commit d709922f5e556bb44d0b068698ad083635d860e2
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Dec 23 10:52:33 2010 +0100

    simplify condition

diff --git a/lotuswordpro/source/filter/lwpobjid.cxx b/lotuswordpro/source/filter/lwpobjid.cxx
index b4e5a85..c220068 100644
--- a/lotuswordpro/source/filter/lwpobjid.cxx
+++ b/lotuswordpro/source/filter/lwpobjid.cxx
@@ -211,7 +211,7 @@ sal_uInt32 LwpObjectID::ReadCompressed( LwpObjectStream* pObj, LwpObjectID &prev
 sal_uInt32 LwpObjectID::DiskSizeIndexed() const
 {
     return sizeof(sal_uInt8)
-        + (((0 < m_nIndex) && (m_nIndex <= 255)) ? 0 : sizeof(m_nLow))
+        + ((m_nIndex != 0) ? 0 : sizeof(m_nLow))
         + sizeof(m_nHigh);
 }
 /**