diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-16 09:30:20 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-16 09:30:20 +0100 |
| commit | a6ded3b0137f378a9e7a83903193d6e3fd9b0126 (patch) | |
| tree | 3707745222b1a37adc153c4ad1ca118af0ecc268 /sw/source/uibase/shells | |
| parent | 3a122347b9a47f1ff7103364e90b77bc605fafce (diff) | |
Clean up integers representing positions in SwOutlineNodes vectors
Change-Id: If1a6a9cb61ffd355a85835127e7c893969833587
Diffstat (limited to 'sw/source/uibase/shells')
| -rw-r--r-- | sw/source/uibase/shells/listsh.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx index 995dac23a58f..786dfe23f7d3 100644 --- a/sw/source/uibase/shells/listsh.cxx +++ b/sw/source/uibase/shells/listsh.cxx @@ -65,8 +65,8 @@ void SwListShell::InitInterface_Impl() // function is quite similar the code in SwContentTree::ExecCommand. static void lcl_OutlineUpDownWithSubPoints( SwWrtShell& rSh, bool bMove, bool bUp ) { - const sal_uInt16 nActPos = rSh.GetOutlinePos(); - if ( nActPos < USHRT_MAX && rSh.IsOutlineMovable( nActPos ) ) + const SwOutlineNodes::size_type nActPos = rSh.GetOutlinePos(); + if ( nActPos < SwOutlineNodes::npos && rSh.IsOutlineMovable( nActPos ) ) { rSh.Push(); rSh.MakeOutlineSel( nActPos, nActPos, true ); @@ -75,8 +75,8 @@ static void lcl_OutlineUpDownWithSubPoints( SwWrtShell& rSh, bool bMove, bool bU { const IDocumentOutlineNodes* pIDoc( rSh.getIDocumentOutlineNodesAccess() ); const int nActLevel = pIDoc->getOutlineLevel( nActPos ); - sal_Int32 nActEndPos = nActPos + 1; - sal_Int16 nDir = 0; + SwOutlineNodes::size_type nActEndPos = nActPos + 1; + SwOutlineNodes::difference_type nDir = 0; if ( !bUp ) { @@ -90,7 +90,7 @@ static void lcl_OutlineUpDownWithSubPoints( SwWrtShell& rSh, bool bMove, bool bU // The current subpoint which should be moved // starts at nActPos and ends at nActEndPos - 1 --nActEndPos; - sal_Int32 nDest = nActEndPos + 2; + SwOutlineNodes::size_type nDest = nActEndPos + 2; while ( nDest < pIDoc->getOutlineNodesCount() && pIDoc->getOutlineLevel( nDest ) > nActLevel ) ++nDest; @@ -104,7 +104,7 @@ static void lcl_OutlineUpDownWithSubPoints( SwWrtShell& rSh, bool bMove, bool bU if ( nActPos > 0 ) { --nActEndPos; - sal_Int32 nDest = nActPos - 1; + SwOutlineNodes::size_type nDest = nActPos - 1; while ( nDest > 0 && pIDoc->getOutlineLevel( nDest ) > nActLevel ) --nDest; |