[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - sw/source

[Andras Timar]

 sw/source/ui/uno/unomailmerge.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 027e8b126b85d1c7abf458f2b37b61f76e7d3d47
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Mar 24 10:50:02 2014 +0100

    fdo#74155 mailmerge output path fix
    
    regression from dd7acb3d76cd89b3f05dbdafe88eb50e60fd9d10
    
    Change-Id: Ia79ed67df1f0e2803bd3e729951dee3a7438096d
    Reviewed-on: https://gerrit.libreoffice.org/8729
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 6181b3fe2c11d55f46eaaf657877aa9396c16374)

diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index f1a75fe..398376fac 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -707,7 +707,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
 
         OUString aDelim = OUString(INET_PATH_TOKEN);
         if (aPath.getLength() >= aDelim.getLength() &&
-            aPath.copy( aPath.getLength() - aDelim.getLength() ) == aDelim)
+            aPath.copy( aPath.getLength() - aDelim.getLength() ) != aDelim)
             aPath += aDelim;
         if (bCurFileNameFromColumn)
             pMgr->SetEMailColumn( aCurFileNamePrefix );