diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-08-02 13:05:59 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-08-16 09:10:15 +0200 |
| commit | 0cca3ce6eccb0866f0b4aa79b64865e4a4a0fd34 (patch) | |
| tree | 25a768afab747d3ec10bf4f74956ccc482d515a0 /vcl/source/edit | |
| parent | f455a60824c9af4ec9e7e6b8692677a83392a02c (diff) | |
sal_uInt16 to sal_Int32
Change-Id: I6981781d2842d06631216edc7509d96d878285b6
Diffstat (limited to 'vcl/source/edit')
| -rw-r--r-- | vcl/source/edit/textdoc.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/edit/textdoc.hxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx index a19202c20052..040f8a30cdfb 100644 --- a/vcl/source/edit/textdoc.cxx +++ b/vcl/source/edit/textdoc.cxx @@ -87,7 +87,7 @@ void TextCharAttribList::ResortAttribs() maAttribs.sort(CompareStart); } -TextCharAttrib* TextCharAttribList::FindAttrib( sal_uInt16 nWhich, sal_uInt16 nPos ) +TextCharAttrib* TextCharAttribList::FindAttrib( sal_uInt16 nWhich, sal_Int32 nPos ) { for (TextCharAttribs::reverse_iterator it = maAttribs.rbegin(); it != maAttribs.rend(); ++it) { @@ -100,7 +100,7 @@ TextCharAttrib* TextCharAttribList::FindAttrib( sal_uInt16 nWhich, sal_uInt16 nP return NULL; } -const TextCharAttrib* TextCharAttribList::FindNextAttrib( sal_uInt16 nWhich, sal_uInt16 nFromPos, sal_uInt16 nMaxPos ) const +const TextCharAttrib* TextCharAttribList::FindNextAttrib( sal_uInt16 nWhich, sal_Int32 nFromPos, sal_Int32 nMaxPos ) const { DBG_ASSERT( nWhich, "FindNextAttrib: Which?" ); for (TextCharAttribs::const_iterator it = maAttribs.begin(); it != maAttribs.end(); ++it) @@ -136,7 +136,7 @@ bool TextCharAttribList::HasBoundingAttrib( sal_uInt16 nBound ) return false; } -TextCharAttrib* TextCharAttribList::FindEmptyAttrib( sal_uInt16 nWhich, sal_uInt16 nPos ) +TextCharAttrib* TextCharAttribList::FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 nPos ) { if ( !mbHasEmptyAttribs ) return 0; @@ -540,7 +540,7 @@ TextPaM TextDoc::ConnectParagraphs( TextNode* pLeft, TextNode* pRight ) return aPaM; } -TextPaM TextDoc::RemoveChars( const TextPaM& rPaM, sal_uInt16 nChars ) +TextPaM TextDoc::RemoveChars( const TextPaM& rPaM, sal_Int32 nChars ) { TextNode* pNode = maTextNodes[ rPaM.GetPara() ]; pNode->RemoveText( rPaM.GetIndex(), nChars ); diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx index 77aa782c7e3d..72c7eb18443c 100644 --- a/vcl/source/edit/textdoc.hxx +++ b/vcl/source/edit/textdoc.hxx @@ -53,9 +53,9 @@ public: bool& HasEmptyAttribs() { return mbHasEmptyAttribs; } - TextCharAttrib* FindAttrib( sal_uInt16 nWhich, sal_uInt16 nPos ); - const TextCharAttrib* FindNextAttrib( sal_uInt16 nWhich, sal_uInt16 nFromPos, sal_uInt16 nMaxPos = 0xFFFF ) const; - TextCharAttrib* FindEmptyAttrib( sal_uInt16 nWhich, sal_uInt16 nPos ); + TextCharAttrib* FindAttrib( sal_uInt16 nWhich, sal_Int32 nPos ); + const TextCharAttrib* FindNextAttrib( sal_uInt16 nWhich, sal_Int32 nFromPos, sal_Int32 nMaxPos = SAL_MAX_INT32 ) const; + TextCharAttrib* FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 nPos ); bool HasAttrib( sal_uInt16 nWhich ) const; bool HasBoundingAttrib( sal_uInt16 nBound ); }; @@ -106,7 +106,7 @@ public: std::vector<TextNode*>& GetNodes() { return maTextNodes; } const std::vector<TextNode*>& GetNodes() const { return maTextNodes; } - TextPaM RemoveChars( const TextPaM& rPaM, sal_uInt16 nChars ); + TextPaM RemoveChars( const TextPaM& rPaM, sal_Int32 nChars ); TextPaM InsertText( const TextPaM& rPaM, sal_Unicode c ); TextPaM InsertText( const TextPaM& rPaM, const OUString& rStr ); |