summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/fmcomp/dbaexchange.cxx10
-rw-r--r--svx/source/gallery2/galtheme.cxx4
2 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 129a3657450f..b2683522a304 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -346,14 +346,14 @@ namespace svx
if (!nRecognizedFormat)
return sal_False;
- String sFieldDescription;
+ OUString sFieldDescription;
const_cast<TransferableDataHelper&>(_rData).GetString(nRecognizedFormat, sFieldDescription);
const sal_Unicode cSeparator = sal_Unicode(11);
- _rDatasource = sFieldDescription.GetToken(0, cSeparator);
- _rCommand = sFieldDescription.GetToken(1, cSeparator);
- _nCommandType = sFieldDescription.GetToken(2, cSeparator).ToInt32();
- _rFieldName = sFieldDescription.GetToken(3, cSeparator);
+ _rDatasource = sFieldDescription.getToken(0, cSeparator);
+ _rCommand = sFieldDescription.getToken(1, cSeparator);
+ _nCommandType = sFieldDescription.getToken(2, cSeparator).toInt32();
+ _rFieldName = sFieldDescription.getToken(3, cSeparator);
return sal_True;
}
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index b44df0206c4f..3311fe9be011 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1261,11 +1261,11 @@ sal_Bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::X
aDataHelper.GetFileList( SOT_FORMAT_FILE_LIST, aFileList );
else
{
- String aFile;
+ OUString aFile;
aDataHelper.GetString( FORMAT_FILE, aFile );
- if( aFile.Len() )
+ if( !aFile.isEmpty() )
aFileList.AppendFile( aFile );
}