[Libreoffice-commits] core.git: sw/source

[Jan-Marek Glogowski]

 sw/source/uibase/dbui/dbmgr.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit daafd2ddaf019da11f4d0474b1840ad708a3199c
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Aug 26 19:54:36 2016 +0200

    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

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 6ac018b..d7d6c15 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 );