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

[Caolán McNamara]

 filter/source/config/fragments/types/writer_LotusWordPro_Document.xcu |    2 +-
 lotuswordpro/source/filter/lwpidxmgr.hxx                              |    2 +-
 lotuswordpro/source/filter/lwpobjid.cxx                               |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d93fa011d713100775cd3ac88c468b6830d48877
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 6 21:37:47 2011 +0100

    avoid possibility of accessing out of range ObjTimes

diff --git a/lotuswordpro/source/filter/lwpidxmgr.hxx b/lotuswordpro/source/filter/lwpidxmgr.hxx
index 54b88d8..9fa6074 100644
--- a/lotuswordpro/source/filter/lwpidxmgr.hxx
+++ b/lotuswordpro/source/filter/lwpidxmgr.hxx
@@ -112,7 +112,7 @@ protected:
 public:
     void Read( LwpSvStream *pStrm );
     sal_uInt32 GetObjOffset( LwpObjectID objid );
-    sal_uInt32 GetObjTime( sal_uInt16 index ) { return m_TimeTable[index-1]; }
+    sal_uInt32 GetObjTime( sal_uInt16 index ) { return m_TimeTable.at(index-1); }
 };
 #endif
 
diff --git a/lotuswordpro/source/filter/lwpobjid.cxx b/lotuswordpro/source/filter/lwpobjid.cxx
index 61d99b4..0a76504 100644
--- a/lotuswordpro/source/filter/lwpobjid.cxx
+++ b/lotuswordpro/source/filter/lwpobjid.cxx
@@ -148,11 +148,11 @@ sal_uInt32 LwpObjectID::ReadIndexed(LwpObjectStream *pStrm)
         LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance();
         LwpObjectFactory* pFactory = pGlobal->GetLwpObjFactory();
         LwpIndexManager* pIdxMgr = pFactory->GetIndexManager();
-        m_nLow =  pIdxMgr->GetObjTime( (sal_uInt16)m_nIndex);
+        m_nLow = pIdxMgr->GetObjTime( (sal_uInt16)m_nIndex);
     }
     else
     {
-         pStrm->QuickRead(&m_nLow, sizeof(m_nLow));
+        pStrm->QuickRead(&m_nLow, sizeof(m_nLow));
     }
     pStrm->QuickRead(&m_nHigh, sizeof(m_nHigh));
     return DiskSizeIndexed();
commit 3940aa73191d27efba9c70331d6460b78fe9320a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 6 20:44:24 2011 +0100

    add in application/vnd.lotus-wordpro mimetype

diff --git a/filter/source/config/fragments/types/writer_LotusWordPro_Document.xcu b/filter/source/config/fragments/types/writer_LotusWordPro_Document.xcu
index 51946c7..5ebd098 100644
--- a/filter/source/config/fragments/types/writer_LotusWordPro_Document.xcu
+++ b/filter/source/config/fragments/types/writer_LotusWordPro_Document.xcu
@@ -2,7 +2,7 @@
         <prop oor:name="DetectService"><value>com.sun.star.comp.Writer.LotusWordProImportFilter</value></prop>
         <prop oor:name="URLPattern"/>
         <prop oor:name="Extensions"><value>lwp</value></prop>
-        <prop oor:name="MediaType"/>
+        <prop oor:name="MediaType"><value>application/vnd.lotus-wordpro</value></prop>
         <prop oor:name="Preferred"><value>false</value></prop>
         <prop oor:name="PreferredFilter"><value>LotusWordPro</value></prop>
         <prop oor:name="UIName">