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

[Kohei Yoshida]

 lotuswordpro/source/filter/lwpobjid.cxx           |    2 +-
 lotuswordpro/source/filter/lwpoleobject.cxx       |   19 -------------------
 lotuswordpro/source/filter/lwpoleobject.hxx       |    1 -
 lotuswordpro/source/filter/lwpparastyle.cxx       |    2 +-
 writerperfect/source/filter/DocumentCollector.cxx |    2 +-
 5 files changed, 3 insertions(+), 23 deletions(-)

New commits:
commit 54c30e7f301c0879d48d60322be962d53840d264
Author: Christian Lohmaier <lohmaier+libreoffice at googlemail.com>
Date:   Tue Jan 18 15:28:00 2011 -0500

    WaE patch for filter
    
    Signed-off-by: Kohei Yoshida <kyoshida at novell.com>

diff --git a/lotuswordpro/source/filter/lwpobjid.cxx b/lotuswordpro/source/filter/lwpobjid.cxx
index c220068..61d99b4 100644
--- a/lotuswordpro/source/filter/lwpobjid.cxx
+++ b/lotuswordpro/source/filter/lwpobjid.cxx
@@ -235,7 +235,7 @@ LwpObject* LwpObjectID::obj(VO_TYPE tag) const
     LwpObject* pObj = pObjMgr->QueryObject(*this);
     if( tag!=VO_INVALID &&  (pObj) )
     {
-        if(tag!=pObj->GetTag())
+        if(static_cast<sal_uInt32>(tag) != pObj->GetTag())
         {
             pObj=NULL;
         }
diff --git a/lotuswordpro/source/filter/lwpoleobject.cxx b/lotuswordpro/source/filter/lwpoleobject.cxx
index 8a0e359..ef0c7cc 100644
--- a/lotuswordpro/source/filter/lwpoleobject.cxx
+++ b/lotuswordpro/source/filter/lwpoleobject.cxx
@@ -251,26 +251,7 @@ void LwpOleObject::Read()
     }
 
 }
-/**
- * @descr:   Construct ole-storage name by ObjectID
- * @param:  pObjName - input&output string of object name, spaces allocated outside and at least length should be MAX_STREAMORSTORAGENAME
- * @return:  None
- * @date:    2/22/2005
- */
-void LwpOleObject::GetChildStorageName(char *pObjName)
-{
-    /*LwpObjectFactory * pObjMgr = LwpObjectFactory::Instance();
-    LwpIndexManager * pIdxMgr = pObjMgr->GetIndexManager();
-    sal_uInt32 nLowID = pIdxMgr->GetObjTime(static_cast<sal_uInt16>(GetObjectID()->GetLow()));*/
-
-    char sName[MAX_STREAMORSTORAGENAME];
-    //LwpObjectID ID(nLowID, GetObjectID()->GetHigh());
-    sprintf( sName, "%s%X,%X", "Ole",
-      GetObjectID()->GetHigh(), GetObjectID()->GetLow());
 
-    strcpy( pObjName, sName);
-    return;
-}
 /**
  * @descr:   Parse VO_OLEOBJECT and dump to XML stream only on WIN32 platform
  * @param:  pOutputStream - stream to dump OLE object
diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx
index 2c5526e..cca9189 100644
--- a/lotuswordpro/source/filter/lwpoleobject.hxx
+++ b/lotuswordpro/source/filter/lwpoleobject.hxx
@@ -129,7 +129,6 @@ public:
     virtual void RegisterStyle();
     void GetGrafOrgSize(double& rWidth, double& rHeight) ;
 private:
-    void GetChildStorageName(char *pObjName);
     Rectangle GetOLEObjectSize( SotStorage * pStor ) const;
 
     sal_uInt16 cPersistentFlags;
diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx
index 664751e..ecd1156 100644
--- a/lotuswordpro/source/filter/lwpparastyle.cxx
+++ b/lotuswordpro/source/filter/lwpparastyle.cxx
@@ -657,7 +657,7 @@ void LwpParaStyle::ApplyTab(XFParaStyle *pParaStyle, LwpTabOverride *pTabOverRid
         double fLen = LwpTools::ConvertFromUnitsToMetric(nPos) - dMarginLeft;
 
         //get leader type
-        sal_Unicode cLeader;
+        sal_Unicode cLeader = 0x00;
         LwpTab::LeaderType leader= pTab->GetLeaderType();
         switch(leader)
         {
diff --git a/writerperfect/source/filter/DocumentCollector.cxx b/writerperfect/source/filter/DocumentCollector.cxx
index 1ef8dcc..6f618d8 100644
--- a/writerperfect/source/filter/DocumentCollector.cxx
+++ b/writerperfect/source/filter/DocumentCollector.cxx
@@ -655,7 +655,7 @@ void DocumentCollector::defineOrderedListLevel(const WPXPropertyList &propList)
     // is starting a new list at level 1 (and only level 1)
     if (pOrderedListStyle == NULL || pOrderedListStyle->getListID() != id  ||
         (propList["libwpd:level"] && propList["libwpd:level"]->getInt()==1 && 
-         (propList["text:start-value"] && propList["text:start-value"]->getInt() != (mWriterListStates.top().miLastListNumber+1))))
+         (propList["text:start-value"] && propList["text:start-value"]->getInt() != static_cast<int>(mWriterListStates.top().miLastListNumber+1))))
     {
         WRITER_DEBUG_MSG(("Attempting to create a new ordered list style (listid: %i)\n", id));
         WPXString sName;