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

Noel Grandin noel at peralex.com
Mon Apr 25 11:26:00 UTC 2016


 connectivity/source/commontools/propertyids.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 753fa20383568b3fc568f209328fdf50f25274a1
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Apr 25 13:24:24 2016 +0200

    fix Windows build
    
    Change-Id: I35b0d9a1ed6b4929217e75a03132f53844acd5b9

diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index ca91112..b653d0f 100644
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
@@ -24,7 +24,8 @@ namespace dbtools
 {
     OPropertyMap::OPropertyMap()
     {
-        m_aPropertyMap = {
+        // MSVC complains about ambiguous operator=
+        m_aPropertyMap.insert({
                 {PROPERTY_ID_QUERYTIMEOUT,         "QueryTimeOut"},
                 {PROPERTY_ID_MAXFIELDSIZE,         "MaxFieldSize"},
                 {PROPERTY_ID_MAXROWS,              "MaxRows"},
@@ -88,7 +89,7 @@ namespace dbtools
                 {PROPERTY_ID_FIELDTYPE,            "FieldType"},
                 {PROPERTY_ID_VALUE,                "Value"},
                 {PROPERTY_ID_ACTIVE_CONNECTION,    "ActiveConnection"},
-            };
+            } );
     }
 
     const OUString& OPropertyMap::getNameByIndex(sal_Int32 _nIndex) const


More information about the Libreoffice-commits mailing list