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

convert vcl/cmdevt.hxx from XubString to OUString

Browse Source 
Change-Id: Ib574cc7130f49c7a6be23566377313906c52abb8
This commit is contained in:
Noel Grandin
2013-08-01 12:38:47 +02:00
parent 830f6cec6d
commit d3ebe15c1e
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editeng/source/editeng/impedit2.cxx
View File

@@ -426,7 +426,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
( nNewIMETextLen < mpIMEInfos->aOldTextAfterStartPos.Len() ) ) ( nNewIMETextLen < mpIMEInfos->aOldTextAfterStartPos.Len() ) )
{ {
// restore old characters // restore old characters
sal_uInt16 nRestore = nOldIMETextLen - nNewIMETextLen; sal_Int32 nRestore = nOldIMETextLen - nNewIMETextLen;
EditPaM aPaM( mpIMEInfos->aPos ); EditPaM aPaM( mpIMEInfos->aPos );
aPaM.GetIndex() = aPaM.GetIndex() + nNewIMETextLen; aPaM.GetIndex() = aPaM.GetIndex() + nNewIMETextLen;
ImpInsertText( aPaM, mpIMEInfos->aOldTextAfterStartPos.Copy( nNewIMETextLen, nRestore ) ); ImpInsertText( aPaM, mpIMEInfos->aOldTextAfterStartPos.Copy( nNewIMETextLen, nRestore ) );

6
include/vcl/cmdevt.hxx
View File

@@ -56,10 +56,10 @@ private:
public: public:
CommandExtTextInputData( const OUString& rText, CommandExtTextInputData( const OUString& rText,
const sal_uInt16* pTextAttr, const sal_uInt16* pTextAttr,
xub_StrLen nCursorPos, sal_Int32 nCursorPos,
sal_uInt16 nCursorFlags, sal_uInt16 nCursorFlags,
xub_StrLen nDeltaStart, sal_Int32 nDeltaStart,
xub_StrLen nOldTextLen, sal_Int32 nOldTextLen,
sal_Bool bOnlyCursor ); sal_Bool bOnlyCursor );
CommandExtTextInputData( const CommandExtTextInputData& rData ); CommandExtTextInputData( const CommandExtTextInputData& rData );
~CommandExtTextInputData(); ~CommandExtTextInputData();

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

@@ -2233,7 +2233,7 @@ void Edit::Command( const CommandEvent& rCEvt )
( nNewIMETextLen < mpIMEInfos->aOldTextAfterStartPos.getLength() ) ) ( nNewIMETextLen < mpIMEInfos->aOldTextAfterStartPos.getLength() ) )
{ {
// restore old characters // restore old characters
sal_uInt16 nRestore = nOldIMETextLen - nNewIMETextLen; sal_Int32 nRestore = nOldIMETextLen - nNewIMETextLen;
maText.insert( mpIMEInfos->nPos + nNewIMETextLen, mpIMEInfos->aOldTextAfterStartPos.copy( nNewIMETextLen, nRestore ) ); maText.insert( mpIMEInfos->nPos + nNewIMETextLen, mpIMEInfos->aOldTextAfterStartPos.copy( nNewIMETextLen, nRestore ) );
} }
else if ( ( nOldIMETextLen < nNewIMETextLen ) && else if ( ( nOldIMETextLen < nNewIMETextLen ) &&

2
vcl/source/edit/textview.cxx
View File

@@ -957,7 +957,7 @@ void TextView::Command( const CommandEvent& rCEvt )
( nNewIMETextLen < mpImpl->mpTextEngine->mpIMEInfos->aOldTextAfterStartPos.Len() ) ) ( nNewIMETextLen < mpImpl->mpTextEngine->mpIMEInfos->aOldTextAfterStartPos.Len() ) )
{ {
// restore old characters // restore old characters
sal_uInt16 nRestore = nOldIMETextLen - nNewIMETextLen; sal_Int32 nRestore = nOldIMETextLen - nNewIMETextLen;
TextPaM aPaM( mpImpl->mpTextEngine->mpIMEInfos->aPos ); TextPaM aPaM( mpImpl->mpTextEngine->mpIMEInfos->aPos );
aPaM.GetIndex() = aPaM.GetIndex() + nNewIMETextLen; aPaM.GetIndex() = aPaM.GetIndex() + nNewIMETextLen;
mpImpl->mpTextEngine->ImpInsertText( aPaM, mpImpl->mpTextEngine->mpIMEInfos->aOldTextAfterStartPos.Copy( nNewIMETextLen, nRestore ) ); mpImpl->mpTextEngine->ImpInsertText( aPaM, mpImpl->mpTextEngine->mpIMEInfos->aOldTextAfterStartPos.Copy( nNewIMETextLen, nRestore ) );

6
vcl/source/window/cmdevt.cxx
View File

@@ -24,10 +24,10 @@
CommandExtTextInputData::CommandExtTextInputData( const OUString& rText, CommandExtTextInputData::CommandExtTextInputData( const OUString& rText,
const sal_uInt16* pTextAttr, const sal_uInt16* pTextAttr,
xub_StrLen nCursorPos, sal_Int32 nCursorPos,
sal_uInt16 nCursorFlags, sal_uInt16 nCursorFlags,
xub_StrLen nDeltaStart, sal_Int32 nDeltaStart,
xub_StrLen nOldTextLen, sal_Int32 nOldTextLen,
sal_Bool bOnlyCursor ) : sal_Bool bOnlyCursor ) :
maText( rText ) maText( rText )
{ {