diff options
author | Noel Grandin <noel@peralex.com> | 2013-08-01 12:38:47 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-08-12 11:56:37 +0200 |
commit | d3ebe15c1e37c2e491c07caa7128abff30f29e40 (patch) | |
tree | 9dd39923fc0ec9de12368cc27231843e4b2bc3f8 | |
parent | 830f6cec6defae3d96ec7738e500a148b8c3aff1 (diff) |
convert vcl/cmdevt.hxx from XubString to OUString
Change-Id: Ib574cc7130f49c7a6be23566377313906c52abb8
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 2 | ||||
-rw-r--r-- | include/vcl/cmdevt.hxx | 6 | ||||
-rw-r--r-- | vcl/source/control/edit.cxx | 2 | ||||
-rw-r--r-- | vcl/source/edit/textview.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/cmdevt.cxx | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 1297b7816f4c..89c090896014 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -426,7 +426,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView ) ( nNewIMETextLen < mpIMEInfos->aOldTextAfterStartPos.Len() ) ) { // restore old characters - sal_uInt16 nRestore = nOldIMETextLen - nNewIMETextLen; + sal_Int32 nRestore = nOldIMETextLen - nNewIMETextLen; EditPaM aPaM( mpIMEInfos->aPos ); aPaM.GetIndex() = aPaM.GetIndex() + nNewIMETextLen; ImpInsertText( aPaM, mpIMEInfos->aOldTextAfterStartPos.Copy( nNewIMETextLen, nRestore ) ); diff --git a/include/vcl/cmdevt.hxx b/include/vcl/cmdevt.hxx index 45ac7a802d0d..f679b2357975 100644 --- a/include/vcl/cmdevt.hxx +++ b/include/vcl/cmdevt.hxx @@ -56,10 +56,10 @@ private: public: CommandExtTextInputData( const OUString& rText, const sal_uInt16* pTextAttr, - xub_StrLen nCursorPos, + sal_Int32 nCursorPos, sal_uInt16 nCursorFlags, - xub_StrLen nDeltaStart, - xub_StrLen nOldTextLen, + sal_Int32 nDeltaStart, + sal_Int32 nOldTextLen, sal_Bool bOnlyCursor ); CommandExtTextInputData( const CommandExtTextInputData& rData ); ~CommandExtTextInputData(); diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index fe5f8b363c7f..f887260adc17 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2233,7 +2233,7 @@ void Edit::Command( const CommandEvent& rCEvt ) ( nNewIMETextLen < mpIMEInfos->aOldTextAfterStartPos.getLength() ) ) { // restore old characters - sal_uInt16 nRestore = nOldIMETextLen - nNewIMETextLen; + sal_Int32 nRestore = nOldIMETextLen - nNewIMETextLen; maText.insert( mpIMEInfos->nPos + nNewIMETextLen, mpIMEInfos->aOldTextAfterStartPos.copy( nNewIMETextLen, nRestore ) ); } else if ( ( nOldIMETextLen < nNewIMETextLen ) && diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 7a083b86e49a..4f62ee49e79a 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -957,7 +957,7 @@ void TextView::Command( const CommandEvent& rCEvt ) ( nNewIMETextLen < mpImpl->mpTextEngine->mpIMEInfos->aOldTextAfterStartPos.Len() ) ) { // restore old characters - sal_uInt16 nRestore = nOldIMETextLen - nNewIMETextLen; + sal_Int32 nRestore = nOldIMETextLen - nNewIMETextLen; TextPaM aPaM( mpImpl->mpTextEngine->mpIMEInfos->aPos ); aPaM.GetIndex() = aPaM.GetIndex() + nNewIMETextLen; mpImpl->mpTextEngine->ImpInsertText( aPaM, mpImpl->mpTextEngine->mpIMEInfos->aOldTextAfterStartPos.Copy( nNewIMETextLen, nRestore ) ); diff --git a/vcl/source/window/cmdevt.cxx b/vcl/source/window/cmdevt.cxx index ef0591cf5a7d..15f6d06ffcb0 100644 --- a/vcl/source/window/cmdevt.cxx +++ b/vcl/source/window/cmdevt.cxx @@ -24,10 +24,10 @@ CommandExtTextInputData::CommandExtTextInputData( const OUString& rText, const sal_uInt16* pTextAttr, - xub_StrLen nCursorPos, + sal_Int32 nCursorPos, sal_uInt16 nCursorFlags, - xub_StrLen nDeltaStart, - xub_StrLen nOldTextLen, + sal_Int32 nDeltaStart, + sal_Int32 nOldTextLen, sal_Bool bOnlyCursor ) : maText( rText ) { |