diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-08-26 19:54:36 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-08-26 20:11:25 +0200 |
| commit | daafd2ddaf019da11f4d0474b1840ad708a3199c (patch) | |
| tree | 0ab7689f1e6ab1fb1fc8880925534bcc92f3be08 | |
| parent | 9fc04e6e36fa4f40f942bb643b77b03979c8d29e (diff) | |
tdf#100002 MM: directly try filename from column
If we generate multiple files via mail merge with the same name,
we append a number to any file, so the "basename" filename won't
actually be generated.
But if we get the filename from a database column, the user
expects to try the original file name before trying a name with
an appended number.
Change-Id: I68411901ed90d8e9a21423de9233a5be4f41eb12
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 6ac018bf7933..d7d6c151f0ae 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1322,7 +1322,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, aEntry.removeSegment(); sPath = aEntry.GetMainURL( INetURLObject::NO_DECODE ); OUString sExt(comphelper::string::stripStart(pStoreToFilter->GetDefaultExtension(), '*')); - aTempFile.reset( new utl::TempFile(sLeading, true, &sExt, &sPath) ); + aTempFile.reset( new utl::TempFile(sLeading, sColumnData.isEmpty(), &sExt, &sPath) ); if( !aTempFile->IsValid() ) { ErrorHandler::HandleError( ERRCODE_IO_NOTSUPPORTED ); |