[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sfx2/source

Akshay Deep akshaydeepiitr at gmail.com
Wed Jun 15 22:24:11 UTC 2016


 sfx2/source/doc/doctempl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 51034e90af7e7da683598724f9aba90953a67fa5
Author: Akshay Deep <akshaydeepiitr at gmail.com>
Date:   Wed Jun 15 12:54:23 2016 +0530

    Template Export: Don't overwrite the existing template in a directory
    
    Change-Id: I19470c7eeb961665cb5248861b030479a0796a24
    Reviewed-on: https://gerrit.libreoffice.org/26290
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit 4f61b652323e1bde5c45bc9dece3c61b2f69b83d)
    Reviewed-on: https://gerrit.libreoffice.org/26312
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Akshay Deep <akshaydeepiitr at gmail.com>

diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index c3d9d34..2ed3fc6 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -721,7 +721,7 @@ bool SfxDocumentTemplates::CopyTo
         aTransferInfo.MoveData = false;
         aTransferInfo.SourceURL = pSource->GetTargetURL();
         aTransferInfo.NewTitle = aTitle;
-        aTransferInfo.NameClash = NameClash::OVERWRITE;
+        aTransferInfo.NameClash = NameClash::RENAME;
 
         Any aArg = makeAny( aTransferInfo );
         OUString aCmd( COMMAND_TRANSFER  );


More information about the Libreoffice-commits mailing list