cbosdo02: fixes of compiler warning on Linux, Mac OS X Intel and Solaris Sparc

8 files changed, 8 insertions, 24 deletions

diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 789600f72e0e..49f8d8bfbb5f 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -272,7 +272,7 @@ public:
     DECL_FIXEDMEMPOOL_NEWDEL(SwPaM);
 
     String GetTxt() const;
-    void Invalidate();
+    void InvalidatePaM();
 };
 
 
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 5d74ec7b4324..9591b66fbab4 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -371,7 +371,7 @@ namespace sw { namespace mark
     void Fieldmark::invalidate( )
     {
         SwPaM aPaM( this->GetMarkPos(), this->GetOtherMarkPos() );
-        aPaM.Invalidate();
+        aPaM.InvalidatePaM();
     }
 
     const ::rtl::OUString Fieldmark::our_sNamePrefix = ::rtl::OUString::createFromAscii("__Fieldmark__");
diff --git a/sw/source/core/crsr/makefile.mk b/sw/source/core/crsr/makefile.mk
index 57cb499dec66..5d450e82aced 100644
--- a/sw/source/core/crsr/makefile.mk
+++ b/sw/source/core/crsr/makefile.mk
@@ -51,6 +51,7 @@ CDEFS+=-Dmydebug
 EXCEPTIONSFILES=    \
     $(SLO)$/crbm.obj \
     $(SLO)$/crsrsh.obj \
+    $(SLO)$/bookmrk.obj \
     $(SLO)$/viscrs.obj
 
 SLOFILES =	\
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index e7000bd17698..c441554524ed 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -1229,7 +1229,7 @@ BOOL SwPaM::Overlap(const SwPaM & a, const SwPaM & b)
     return !(*b.End() <= *a.Start() || *a.End() <= *b.End());
 }
 
-void SwPaM::Invalidate()
+void SwPaM::InvalidatePaM()
 {
     const SwNode *_pNd=this->GetNode();
     const SwTxtNode *_pTxtNd=(_pNd!=NULL?_pNd->GetTxtNode():NULL);
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 0780dfd6696e..6fc877c1f66f 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -67,23 +67,6 @@
 #include <viscrs.hxx>
 #include <stdio.h>
 
-static void lcl_docbm_FixPosition( SwPosition& rPos )
-{
-    // make sure the position has 1) the proper node, and 2) a proper index
-    SwTxtNode* pTxtNode = rPos.nNode.GetNode().GetTxtNode();
-
-    if( rPos.nContent.GetIndex() > ( pTxtNode == NULL ? 0 : pTxtNode->Len() ) )
-    {
-        DBG_ERROR( "illegal position" );
-        xub_StrLen nLen = rPos.nContent.GetIndex();
-        if( pTxtNode == NULL )
-            nLen = 0;
-        else if( nLen >= pTxtNode->Len() )
-            nLen = pTxtNode->Len();
-        rPos.nContent.Assign( pTxtNode, nLen );
-    }
-}
-
 
 using namespace ::std;
 using namespace ::boost;
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 02ab28a1e6ec..ff57f1136152 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3596,7 +3596,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
     }
 }
 
-void WW8Export::WriteHyperlinkData( const sw::mark::IFieldmark& rFieldmark )
+void WW8Export::WriteHyperlinkData( const sw::mark::IFieldmark& /*rFieldmark*/ )
 {
     //@TODO implement me !!!
 }
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index f35fb6ccf159..c6e56f416230 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -4216,8 +4216,8 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                                 if ( aCntntAtPos.aFnd.pFldmark != NULL)
                                 {
                                     IFieldmark *fieldBM = const_cast< IFieldmark* > ( aCntntAtPos.aFnd.pFldmark );
-                                    SwDocShell* pDocSh = rView.GetDocShell();
-                                    SwDoc *pDoc=pDocSh->GetDoc();
+                                    //SwDocShell* pDocSh = rView.GetDocShell();
+                                    //SwDoc *pDoc=pDocSh->GetDoc();
                                     if (fieldBM->GetFieldname( ).equalsAscii( ECMA_FORMCHECKBOX ) )
                                     {
                                         bool isChecked = fieldBM->getParam( ECMA_FORMCHECKBOX_CHECKED ).second.compareToAscii("on") == 0;
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index 20deec4a0fda..b57d00a9787e 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -1055,7 +1055,7 @@ BOOL SwView::ExecFieldPopup( const Point& rPt, IFieldmark *fieldBM )
     SwFieldDialog aFldDlg(pEditWin, fieldBM);
     aFldDlg.SetPosPixel(pEditWin->OutputToScreenPixel(aPixPos));
 
-    short ret=aFldDlg.Execute();
+    /*short ret=*/aFldDlg.Execute();
     int selection=aFldDlg.getSelection();
     if (selection>=0) {
         fieldBM->addParam(ECMA_FORMDROPDOWN_RESULT, selection);