diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-08-15 12:54:57 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-08-16 09:10:19 +0200 |
| commit | 866e287adee448c1c8b431c6c084d3fe3283649d (patch) | |
| tree | 53864635bcb2832c92834678a66b7090f1181147 /sw | |
| parent | a00c47afd4cf379ce2b22f3c33bb7975a5a6366a (diff) | |
sal_uLong to sal_uInt32 as TextPaM paragraph number
Applied also to related functions.
Also fix a couple of minor issues while at it.
Change-Id: I615094d047c87a0f4854054e720492d3ab25c575
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 10 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/srcview.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 1bb0ec8d9bdc..843fbe375c70 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -1443,7 +1443,7 @@ void AddressMultiLineEdit::InsertNewEntry( const OUString& rStr ) // insert new entry after current selected one. ExtTextView* pTextView = GetTextView(); const TextSelection& rSelection = pTextView->GetSelection(); - sal_uLong nPara = rSelection.GetStart().GetPara(); + const sal_uInt32 nPara = rSelection.GetStart().GetPara(); sal_Int32 nIndex = rSelection.GetEnd().GetIndex(); ExtTextEngine *pTextEngine = GetTextEngine(); const TextCharAttrib *pAttrib; @@ -1486,7 +1486,7 @@ void AddressMultiLineEdit::RemoveCurrentEntry() (pBeginAttrib->GetStart() <= rSelection.GetStart().GetIndex() && pBeginAttrib->GetEnd() >= rSelection.GetEnd().GetIndex())) { - sal_uLong nPara = rSelection.GetStart().GetPara(); + const sal_uInt32 nPara = rSelection.GetStart().GetPara(); TextSelection aEntrySel(TextPaM( nPara, pBeginAttrib->GetStart()), TextPaM(nPara, pBeginAttrib->GetEnd())); pTextEngine->ReplaceText(aEntrySel, OUString()); //restore the attributes @@ -1506,7 +1506,7 @@ void AddressMultiLineEdit::MoveCurrentItem(sal_uInt16 nMove) && pBeginAttrib->GetEnd() >= rSelection.GetEnd().GetIndex())) { //current item has been found - sal_uLong nPara = rSelection.GetStart().GetPara(); + sal_uInt32 nPara = rSelection.GetStart().GetPara(); sal_Int32 nIndex = pBeginAttrib->GetStart(); TextSelection aEntrySel(TextPaM( nPara, pBeginAttrib->GetStart()), TextPaM(nPara, pBeginAttrib->GetEnd())); const OUString sCurrentItem = pTextEngine->GetText(aEntrySel); @@ -1610,7 +1610,7 @@ OUString AddressMultiLineEdit::GetCurrentItem() (pBeginAttrib->GetStart() <= rSelection.GetStart().GetIndex() && pBeginAttrib->GetEnd() >= rSelection.GetEnd().GetIndex())) { - sal_uLong nPara = rSelection.GetStart().GetPara(); + const sal_uInt32 nPara = rSelection.GetStart().GetPara(); TextSelection aEntrySel(TextPaM( nPara, pBeginAttrib->GetStart()), TextPaM(nPara, pBeginAttrib->GetEnd())); return pTextEngine->GetText( aEntrySel ); } @@ -1627,7 +1627,7 @@ void AddressMultiLineEdit::SelectCurrentItem() (pBeginAttrib->GetStart() <= rSelection.GetStart().GetIndex() && pBeginAttrib->GetEnd() >= rSelection.GetEnd().GetIndex())) { - sal_uLong nPara = rSelection.GetStart().GetPara(); + const sal_uInt32 nPara = rSelection.GetStart().GetPara(); TextSelection aEntrySel(TextPaM( nPara, pBeginAttrib->GetStart()), TextPaM(nPara, pBeginAttrib->GetEnd())); pTextView->SetSelection(aEntrySel); Invalidate(); diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 69df7cbb1934..72b4de7b4f59 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -580,7 +580,7 @@ sal_uInt16 SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, bool bAtStart = pTextView->GetSelection() == TextSelection( aPaM, aPaM ); if( !bForward ) - aPaM = TextPaM( (sal_uLong)-1, USHRT_MAX ); + aPaM = TextPaM( TEXT_PARA_ALL, USHRT_MAX ); if( bFromStart ) { |