diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-05-01 17:01:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-02 11:03:10 +0100 |
| commit | 9daa7d433992f8d0e7ceae158a6af5a0a69e41ea (patch) | |
| tree | ab97174a648563826fd87ef43d75b43a0c556c52 | |
| parent | 52bd4ffaac9a48e4838f8e06d6b97fb1c1dd4bb2 (diff) | |
rather nutso, just drop the XubString variant
Change-Id: Iebff2bc517e3b6422a6b410f44d78cee1b6d971d
| -rw-r--r-- | include/vcl/textview.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/edit/textview.cxx | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index 314e30fa4f1e..9873d89df494 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -125,9 +125,7 @@ public: String GetSelected( LineEnd aSeparator ); void DeleteSelected(); - void InsertNewText( const OUString& rNew, sal_Bool bSelect = sal_False ); - // deprecated: use InsertNewText instead - void InsertText( const String& rNew, sal_Bool bSelect = sal_False ); + void InsertText( const OUString& rNew, sal_Bool bSelect = sal_False ); sal_Bool KeyInput( const KeyEvent& rKeyEvent ); void Paint( const Rectangle& rRect ); diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 05ea5f2e16dc..44836161a8de 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -1181,7 +1181,7 @@ void TextView::Paste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC bool bWasTruncated = false; if( mpImpl->mpTextEngine->GetMaxTextLen() != 0 ) bWasTruncated = ImplTruncateNewText( aText ); - InsertNewText( aText, sal_False ); + InsertText( aText, sal_False ); mpImpl->mpTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) ); if( bWasTruncated ) @@ -1337,12 +1337,7 @@ TextSelection TextView::ImpMoveCursor( const KeyEvent& rKeyEvent ) return mpImpl->maSelection; } -void TextView::InsertText( const XubString& rStr, sal_Bool bSelect ) -{ - InsertNewText( rStr, bSelect ); -} - -void TextView::InsertNewText( const OUString& rStr, sal_Bool bSelect ) +void TextView::InsertText( const OUString& rStr, sal_Bool bSelect ) { // HideSelection(); mpImpl->mpTextEngine->UndoActionStart(); |