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

[Michael Stahl]

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

New commits:
commit 4494547e1e17cf3230b8c1a389ed1e82aa6fe32f
Author: Michael Stahl <mst...@redhat.com>
Date:   Tue Jul 21 20:43:12 2015 +0200

    sw: speak slowly and clearly so MSVC2012 gets the message
    
    Change-Id: I16ac1ec2e59940fadb53bed71a0306cebb2e8ab7

diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx 
b/sw/source/uibase/dbui/mmconfigitem.cxx
index 2a36db3..b2e4aeb 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -1039,7 +1039,7 @@ uno::Sequence<uno::Any> 
SwMailMergeConfigItem::GetSelection() const
     if(!m_pImpl->xResultSet.is())
         GetResultSet();
     if(!m_pImpl->xResultSet.is())
-        return {};
+        return uno::Sequence<uno::Any>();
     m_pImpl->xResultSet->last();
     sal_Int32 nResultSetSize = m_pImpl->xResultSet->getRow()+1;
     std::vector<uno::Any> vResult;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits