odfmetadata4: #i109787#: make SwIndex constructor explicit

7 files changed, 14 insertions, 14 deletions

diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index 3cf78b290029..5b9dd827108e 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -63,7 +63,7 @@ class SW_DLLPUBLIC SwIndex
     void Remove();                  // Ausketten
 
 public:
-    SwIndex( SwIndexReg * pReg, xub_StrLen nIdx = 0 );
+    explicit SwIndex(SwIndexReg *const pReg, xub_StrLen const nIdx = 0);
     SwIndex( const SwIndex & );
     SwIndex( const SwIndex &, short nDiff );
     ~SwIndex() { Remove(); }
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 92cd9f5833cf..2c1b6e2bbb65 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -84,7 +84,7 @@ void SwIndexReg::ChkArr()
 
 
 
-SwIndex::SwIndex( SwIndexReg* pArr, xub_StrLen nIdx )
+SwIndex::SwIndex(SwIndexReg *const pArr, xub_StrLen const nIdx)
     : nIndex( nIdx ), pArray( pArr ), pNext( 0 ), pPrev( 0 )
 {
     if( !pArray )
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 9d92886f6de6..ed4ad5b25115 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1384,7 +1384,7 @@ void SwCompareData::ShowDelete( const CompareData& rData, ULONG nStt,
         if( *pCorr->GetPoint() == *pTmp->GetPoint() )
         {
             SwNodeIndex aTmpPos( pTmp->GetMark()->nNode, -1 );
-            *pCorr->GetPoint() = SwPosition( aTmpPos, 0 );
+            *pCorr->GetPoint() = SwPosition( aTmpPos );
         }
     }
 }
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 6465143eabb0..4d68438895a3 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -1407,8 +1407,8 @@ void SwDoc::Paste( const SwDoc& rSource )
 
             {
                 aIndexBefore++;
-                SwPaM aPaM(SwPosition(aIndexBefore, 0),
-                           SwPosition(rInsPos.nNode, 0));
+                SwPaM aPaM(SwPosition(aIndexBefore),
+                           SwPosition(rInsPos.nNode));
 
                 MakeUniqueNumRules(aPaM);
             }
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 3b36416ecb64..0f095068a991 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -578,7 +578,7 @@ BOOL SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, BOOL bDelNodes )
            aSearchPam will contain the point where to move the cursors
            to. */
         SwPaM aSearchPam(*pMyNode->EndOfSectionNode());
-        SwPosition aEndPos(*pStartNd->EndOfSectionNode(), 0);
+        SwPosition aEndPos(*pStartNd->EndOfSectionNode());
         if (! aSearchPam.Move() /* no content node found */
             || *aSearchPam.GetPoint() >= aEndPos /* content node found
                                                     outside surrounding */
@@ -588,7 +588,7 @@ BOOL SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, BOOL bDelNodes )
                content node */
             SwPaM aTmpPam(*pMyNode);
             aSearchPam = aTmpPam;
-            SwPosition aStartPos(*pStartNd, 0);
+            SwPosition aStartPos(*pStartNd);
 
             if ( ! aSearchPam.Move(fnMoveBackward) /* no content node found */
                  || *aSearchPam.GetPoint() <= aStartPos  /* content node
@@ -599,7 +599,7 @@ BOOL SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, BOOL bDelNodes )
                 /* There is no content node in the surrounding of
                    TOX'. Append text node behind TOX' section. */
 
-                SwPosition aInsPos(*pMyNode->EndOfSectionNode(), 0);
+                SwPosition aInsPos(*pMyNode->EndOfSectionNode());
                 AppendTxtNode(aInsPos);
 
                 SwPaM aTmpPam1(aInsPos);
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 4df81e2e188e..4ba5788c137f 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -835,8 +835,8 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
                 pClpDoc->CopyRange( rCopy, rInsPos, false );
                 {
                     aIndexBefore++;
-                    SwPaM aPaM(SwPosition(aIndexBefore, 0),
-                               SwPosition(rInsPos.nNode, 0));
+                    SwPaM aPaM(SwPosition(aIndexBefore),
+                               SwPosition(rInsPos.nNode));
                     aPaM.GetDoc()->MakeUniqueNumRules(aPaM);
                 }
             }
@@ -1065,8 +1065,8 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
 
                 {
                     aIndexBefore++;
-                    SwPaM aPaM(SwPosition(aIndexBefore, 0),
-                               SwPosition(rInsPos.nNode, 0));
+                    SwPaM aPaM(SwPosition(aIndexBefore),
+                               SwPosition(rInsPos.nNode));
 
                     aPaM.GetDoc()->MakeUniqueNumRules(aPaM);
                 }
diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx
index 9d3e7bc1b47e..76adc1197305 100644
--- a/sw/source/filter/rtf/rtffly.cxx
+++ b/sw/source/filter/rtf/rtffly.cxx
@@ -1169,8 +1169,8 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
             SwTxtNode* pTxtNd = pFlySave->nSttNd.GetNode().GetTxtNode();
             SwTxtFlyCnt* pFlyCnt = 0;
             if( 1 == pTxtNd->GetTxt().Len() &&
-                0 != ( pFlyCnt = (SwTxtFlyCnt*)pTxtNd->GetTxtAttr(
-                                                0, RES_TXTATR_FLYCNT )) &&
+                0 != (pFlyCnt = static_cast<SwTxtFlyCnt*>(
+                        pTxtNd->GetTxtAttrForCharAt(0, RES_TXTATR_FLYCNT))) &&
                 pFlyCnt->GetFlyCnt().GetFrmFmt() )
             {
                 // then move the content into the surrounded fly