[Libreoffice-commits] .: 4 commits - filter/source lotuswordpro/source lotuswordpro/util unoxml/source

[Caolán McNamara]

 filter/source/msfilter/msocximex.cxx           |    4 ++--
 filter/source/msfilter/svxmsbas.cxx            |    2 +-
 lotuswordpro/source/filter/makefile.mk         |    2 +-
 lotuswordpro/source/filter/xfilter/makefile.mk |    2 +-
 lotuswordpro/util/makefile.mk                  |    2 +-
 unoxml/source/xpath/nodelist.cxx               |    4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 0503c25cedc50b09785857fbf56c1b31b6ae5a67
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 20 11:50:27 2010 +0100

    be consistent on the project name

diff --git a/lotuswordpro/source/filter/makefile.mk b/lotuswordpro/source/filter/makefile.mk
index d8f6d32..4271a33 100644
--- a/lotuswordpro/source/filter/makefile.mk
+++ b/lotuswordpro/source/filter/makefile.mk
@@ -1,6 +1,6 @@
 PRJ=..$/..
 
-PRJNAME=filter
+PRJNAME=lotuswordpro
 TARGET=filter
 ENABLE_EXCEPTIONS=true
 
diff --git a/lotuswordpro/source/filter/xfilter/makefile.mk b/lotuswordpro/source/filter/xfilter/makefile.mk
index fdd1a70..898ef9b 100644
--- a/lotuswordpro/source/filter/xfilter/makefile.mk
+++ b/lotuswordpro/source/filter/xfilter/makefile.mk
@@ -56,7 +56,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=lwpfilter
+PRJNAME=lotuswordpro
 TARGET=xfilter
 
 
diff --git a/lotuswordpro/util/makefile.mk b/lotuswordpro/util/makefile.mk
index 938cdc0..7b34a03 100644
--- a/lotuswordpro/util/makefile.mk
+++ b/lotuswordpro/util/makefile.mk
@@ -1,5 +1,5 @@
 PRJ=..
-PRJNAME=lwpft
+PRJNAME=lotuswordpro
 TARGET=lwpft
 VERSION=$(UPD)
 
commit 7de12cb4d3711cb413693cbe70a8c6083f19403a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 20 11:43:36 2010 +0100

    WaE, remove unused parameters

diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index cc9da8c..fc286e9 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -5583,12 +5583,12 @@ sal_Bool HTML_TextBox::Import(com::sun::star::uno::Reference<
     return sal_True;
 }
 
-sal_Bool HTML_TextBox::Read(SotStorageStream *pS)
+sal_Bool HTML_TextBox::Read(SotStorageStream * /*pS*/)
 {
   return sal_True;
 }
 
-sal_Bool HTML_TextBox::ReadFontData(SotStorageStream *pS)
+sal_Bool HTML_TextBox::ReadFontData(SotStorageStream * /*pS*/)
 {
   return sal_True;
 }
commit 927bac83ae94c8448a300019a8152d8325ed0a6a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 20 11:43:06 2010 +0100

    remove unused parameters

diff --git a/filter/source/msfilter/svxmsbas.cxx b/filter/source/msfilter/svxmsbas.cxx
index 967aed4..a1ebbe6 100644
--- a/filter/source/msfilter/svxmsbas.cxx
+++ b/filter/source/msfilter/svxmsbas.cxx
@@ -150,7 +150,7 @@ bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName,
     return bRet;
 }
 
-bool SvxImportMSVBasic::ImportForms_Impl( VBA_Impl& rVBA, const String& rStorageName, const String& rSubStorageName, BOOL bVBAMode )
+bool SvxImportMSVBasic::ImportForms_Impl( VBA_Impl& rVBA, const String& rStorageName, const String& rSubStorageName, BOOL /*bVBAMode*/ )
 {
     SvStorageRef xVBAStg(rVBA.GetStorage()->OpenSotStorage(rStorageName,
         STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYALL));
commit 41b44801ac75fca59f09aafec846edaeea140618
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 19 20:45:55 2010 +0100

    WaE: fix init order

diff --git a/unoxml/source/xpath/nodelist.cxx b/unoxml/source/xpath/nodelist.cxx
index 4b5c469..b4e3313 100644
--- a/unoxml/source/xpath/nodelist.cxx
+++ b/unoxml/source/xpath/nodelist.cxx
@@ -32,8 +32,8 @@
 namespace XPath
 {
     CNodeList::CNodeList(boost::shared_ptr<xmlXPathObject>& rxpathObj, const Reference< XNode >& contextNode)
-        : m_pNodeSet(0)
-        , m_xContextNode(contextNode)
+        : m_xContextNode(contextNode)
+        , m_pNodeSet(0)
     {
         if (rxpathObj != NULL && rxpathObj->type == XPATH_NODESET)
         {