summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-08-05 14:41:20 +0200
committerNoel Grandin <noel@peralex.com>2013-08-12 11:56:40 +0200
commitd70457c70e474ae5f1d2b99c779b68637f5ee4b2 (patch)
treedd4b3c73bf172a963c50f461dbe5cf8d96ed28ce /vcl
parent564f2e4facfc6981aa495306fbc3eba5e7e05c2d (diff)
convert vcl/textview.hxx from String to OUString
Change-Id: I455c49cbd398b88fc45d73f58637d1a8c69d2100
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/edit/textview.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 4f62ee49e79a..083198737d6c 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -63,14 +63,14 @@ class TETextDataObject : public ::com::sun::star::datatransfer::XTransferable
{
private:
- String maText;
+ OUString maText;
SvMemoryStream maHTMLStream;
public:
- TETextDataObject( const String& rText );
+ TETextDataObject( const OUString& rText );
~TETextDataObject();
- String& GetText() { return maText; }
+ OUString& GetText() { return maText; }
SvMemoryStream& GetHTMLStream() { return maHTMLStream; }
// ::com::sun::star::uno::XInterface
@@ -84,7 +84,7 @@ public:
sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException);
};
-TETextDataObject::TETextDataObject( const String& rText ) : maText( rText )
+TETextDataObject::TETextDataObject( const OUString& rText ) : maText( rText )
{
}
@@ -1197,12 +1197,12 @@ void TextView::Paste()
Paste( aClipboard );
}
-String TextView::GetSelected()
+OUString TextView::GetSelected()
{
return GetSelected( GetSystemLineEnd() );
}
-String TextView::GetSelected( LineEnd aSeparator )
+OUString TextView::GetSelected( LineEnd aSeparator )
{
return mpImpl->mpTextEngine->GetText( mpImpl->maSelection, aSeparator );
}
@@ -1351,7 +1351,7 @@ void TextView::InsertText( const OUString& rStr, sal_Bool bSelect )
do
{
sal_Int32 nChunkLen = nLen > 65534 ? 65534 : nLen;
- String aChunk( rStr.copy( nPos, nChunkLen ) );
+ OUString aChunk( rStr.copy( nPos, nChunkLen ) );
TextSelection aNewSel( mpImpl->maSelection );
@@ -1980,13 +1980,13 @@ bool TextView::ImplTruncateNewText( OUString& rNewText ) const
return bTruncated;
}
-sal_Bool TextView::ImplCheckTextLen( const String& rNewText )
+sal_Bool TextView::ImplCheckTextLen( const OUString& rNewText )
{
sal_Bool bOK = sal_True;
if ( mpImpl->mpTextEngine->GetMaxTextLen() )
{
sal_uLong n = mpImpl->mpTextEngine->GetTextLen();
- n += rNewText.Len();
+ n += rNewText.getLength();
if ( n > mpImpl->mpTextEngine->GetMaxTextLen() )
{
// calculate how much text is being deleted
@@ -2077,7 +2077,7 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv
mpImpl->mpTextEngine->UndoActionStart();
- String aText;
+ OUString aText;
uno::Reference< datatransfer::XTransferable > xDataObj = rDTDE.Transferable;
if ( xDataObj.is() )
{
@@ -2092,8 +2092,8 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv
}
}
- if ( aText.Len() && ( aText.GetChar( aText.Len()-1 ) == LINE_SEP ) )
- aText.Erase( aText.Len()-1 );
+ if ( !aText.isEmpty() && ( aText[ aText.getLength()-1 ] == LINE_SEP ) )
+ aText = aText.replaceAt( aText.getLength()-1, 1, "" );
TextPaM aTempStart = mpImpl->maSelection.GetStart();
if ( ImplCheckTextLen( aText ) )