mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

longparas: raise 16bit Impl_IMEInfos limits to 32bit

Browse Source 
Change-Id: I2196119a8205892724f0d8b75a05940666839642
This commit is contained in:
Caolán McNamara
2014-01-12 11:09:33 +00:00
parent 40a8208e67
commit ad4f00a992
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vcl/source/control/edit.cxx
View File

@@ -124,22 +124,22 @@ struct Impl_IMEInfos
{ {
OUString aOldTextAfterStartPos; OUString aOldTextAfterStartPos;
sal_uInt16* pAttribs; sal_uInt16* pAttribs;
xub_StrLen nPos; sal_Int32 nPos;
xub_StrLen nLen; sal_Int32 nLen;
bool bCursor; bool bCursor;
bool bWasCursorOverwrite; bool bWasCursorOverwrite;
Impl_IMEInfos( xub_StrLen nPos, const OUString& rOldTextAfterStartPos ); Impl_IMEInfos(sal_Int32 nPos, const OUString& rOldTextAfterStartPos);
~Impl_IMEInfos(); ~Impl_IMEInfos();
void CopyAttribs( const xub_StrLen* pA, xub_StrLen nL ); void CopyAttribs(const sal_uInt16* pA, sal_Int32 nL);
void DestroyAttribs(); void DestroyAttribs();
}; };
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
Impl_IMEInfos::Impl_IMEInfos( xub_StrLen nP, const OUString& rOldTextAfterStartPos ) Impl_IMEInfos::Impl_IMEInfos(sal_Int32 nP, const OUString& rOldTextAfterStartPos)
: aOldTextAfterStartPos( rOldTextAfterStartPos ) : aOldTextAfterStartPos(rOldTextAfterStartPos)
{ {
nPos = nP; nPos = nP;
nLen = 0; nLen = 0;
@@ -157,7 +157,7 @@ Impl_IMEInfos::~Impl_IMEInfos()
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void Impl_IMEInfos::CopyAttribs( const xub_StrLen* pA, xub_StrLen nL ) void Impl_IMEInfos::CopyAttribs(const sal_uInt16* pA, sal_Int32 nL)
{ {
nLen = nL; nLen = nL;
delete[] pAttribs; delete[] pAttribs;
@@ -1182,7 +1182,7 @@ void Edit::ImplShowCursor( sal_Bool bOnlyIfVisible )
long nCursorWidth = 0; long nCursorWidth = 0;
if ( !mbInsertMode && !maSelection.Len() && (maSelection.Max() < aText.getLength()) ) if ( !mbInsertMode && !maSelection.Len() && (maSelection.Max() < aText.getLength()) )
nCursorWidth = GetTextWidth( aText, (xub_StrLen)maSelection.Max(), 1 ); nCursorWidth = GetTextWidth(aText, maSelection.Max(), 1);
long nCursorPosX = nTextPos + mnXOffset + ImplGetExtraOffset(); long nCursorPosX = nTextPos + mnXOffset + ImplGetExtraOffset();
// cursor should land in visible area // cursor should land in visible area
@@ -1357,7 +1357,7 @@ void Edit::ImplLoadRes( const ResId& rResId )
{ {
Control::ImplLoadRes( rResId ); Control::ImplLoadRes( rResId );
xub_StrLen nTextLength = ReadShortRes(); sal_uInt16 nTextLength = ReadShortRes();
if ( nTextLength ) if ( nTextLength )
SetMaxTextLen( nTextLength ); SetMaxTextLen( nTextLength );
} }