diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-01-14 09:46:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-14 10:53:29 +0000 |
| commit | 46d5aa65b015f19e45b4caeebe4aeee4acdb59c8 (patch) | |
| tree | beba5959294c699b5dc8ae81d473d02b73491c16 /svx | |
| parent | eded6f196058a1557a5cae62733a5aa67077ce10 (diff) | |
longparas: xub_Strlen->sal_Int32
Change-Id: Ib33b2a36e7fcd96ca9e5deff19e1d2d18aebd012
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/accessibility/AccessibleTextHelper.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 6aa63bc2c6e3..00d0263fcf8a 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -47,7 +47,6 @@ #include <vcl/unohelp.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> -#include <tools/string.hxx> //------------------------------------------------------------------------ // @@ -671,12 +670,12 @@ namespace accessibility this, aSelection.nEndPos, maLastSelection.nEndPos, aSelection.nEndPara, maLastSelection.nEndPara); // #108947# Sort new range before calling FireEvent - ::std::pair< xub_StrLen, xub_StrLen > sortedSelection( + ::std::pair<sal_Int32, sal_Int32> sortedSelection( makeSortedPair(::std::min( aSelection.nStartPara, nMaxValidParaIndex ), ::std::min( aSelection.nEndPara, nMaxValidParaIndex ) ) ); // #108947# Sort last range before calling FireEvent - ::std::pair< xub_StrLen, xub_StrLen > sortedLastSelection( + ::std::pair<sal_Int32, sal_Int32> sortedLastSelection( makeSortedPair(::std::min( maLastSelection.nStartPara, nMaxValidParaIndex ), ::std::min( maLastSelection.nEndPara, nMaxValidParaIndex ) ) ); @@ -741,18 +740,18 @@ namespace accessibility else { // check for changed selection on paragraph <nPara> - const xub_StrLen nParaStartPos = + const sal_Int32 nParaStartPos = nPara == aTmpSel.nStartPara ? aTmpSel.nStartPos : 0; - const xub_StrLen nParaEndPos = + const sal_Int32 nParaEndPos = nPara == aTmpSel.nEndPara - ? aTmpSel.nEndPos : STRING_LEN; - const xub_StrLen nLastParaStartPos = + ? aTmpSel.nEndPos : -1; + const sal_Int32 nLastParaStartPos = nPara == aTmpLastSel.nStartPara ? aTmpLastSel.nStartPos : 0; - const xub_StrLen nLastParaEndPos = + const sal_Int32 nLastParaEndPos = nPara == aTmpLastSel.nEndPara - ? aTmpLastSel.nEndPos : STRING_LEN; + ? aTmpLastSel.nEndPos : -1; if ( nParaStartPos != nLastParaStartPos || nParaEndPos != nLastParaEndPos ) { |