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

Andras Timar andras.timar at collabora.com
Mon Mar 24 02:45:02 PDT 2014


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

New commits:
commit f0ec98c18999495152719260a32d4f83572bda10
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Mar 24 10:42:18 2014 +0100

    fdo#74155 mailmerge output path fix
    
    regression from dd7acb3d76cd89b3f05dbdafe88eb50e60fd9d10
    
    Change-Id: Ie2272905a2db7c301307ed625ad74c3f3fe6b275

diff --git a/sw/source/core/uibase/uno/unomailmerge.cxx b/sw/source/core/uibase/uno/unomailmerge.cxx
index 054ce21..63d8199 100644
--- a/sw/source/core/uibase/uno/unomailmerge.cxx
+++ b/sw/source/core/uibase/uno/unomailmerge.cxx
@@ -725,7 +725,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 );


More information about the Libreoffice-commits mailing list