sw/source/uibase/uno/unomailmerge.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b114d094b6163ade1fe213653bf12412daf6c9c1
Author: Alex McMurchy1917 <mcmurchy1917-libreoff...@yahoo.co.uk>
Date: Wed Apr 25 09:31:53 2018 +0100
tdf#117221 - MailMerge: Not recognising outgoing SMTP Server password
when supplied by macro
After testing the pointer m_sOutServerPassword it incorrectly assignes
the value from m_sInServerPassword.
This change fixes this issue.
Change-Id: I868da1891af4d479c7dd4371297017a78248187f
Reviewed-on: https://gerrit.libreoffice.org/53438
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/sw/source/uibase/uno/unomailmerge.cxx
b/sw/source/uibase/uno/unomailmerge.cxx
index b5b477f56587..2816b6a0aa70 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -1006,7 +1006,7 @@ void SAL_CALL SwXMailMerge::setPropertyValue(
else if(pData == &m_sInServerPassword)
bOK = rValue >>= m_sInServerPassword;
else if(pData == &m_sOutServerPassword)
- bOK = rValue >>= m_sInServerPassword;
+ bOK = rValue >>= m_sOutServerPassword;
else {
OSL_FAIL("invalid pointer" );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
