diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-08 13:57:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-10 09:18:59 +0200 |
| commit | 2d5ba868d16661221075b4fc919174ab97dbfb80 (patch) | |
| tree | 407f445645b38621114ccd5f893fd093fdff21f8 /sw/source/ui/uno/unomailmerge.cxx | |
| parent | 066f564990398399b58e083efb260eac93121920 (diff) | |
convert sw/source/ui/inc/uno*.hxx from String to OUString
Change-Id: I7f6b4a29655390356aef9c6045590ee00c0fed4f
Diffstat (limited to 'sw/source/ui/uno/unomailmerge.cxx')
| -rw-r--r-- | sw/source/ui/uno/unomailmerge.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index e601f2478253..d4f43204ca71 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -402,7 +402,7 @@ SwXMailMerge::SwXMailMerge() : SwXMailMerge::~SwXMailMerge() { - if (aTmpFileName.Len()) + if (!aTmpFileName.isEmpty()) DeleteTmpFile_Impl( xModel, xDocSh, aTmpFileName ); else // there was no temporary file in use { @@ -788,7 +788,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( if ( xCurModel.get() != xModel.get() ) { // in case it was a temporary model -> close it, and delete the file DeleteTmpFile_Impl( xCurModel, xCurDocSh, aTmpFileName ); - aTmpFileName.Erase(); + aTmpFileName = ""; } // (in case it wasn't a temporary model, it will be closed in the dtor, at the latest) |