[PATCH] Don't complain about missing colon in empty DSN

[Mathias Hasselmann (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2885

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/2885/1

Don't complain about missing colon in empty DSN

Empty datasource names occur with the datasource wizard's first page
when no datasource type has been selected yet.

Change-Id: I9bcd025aab046e6cb79db47564f55ae3f0faed55
---
M dbaccess/source/core/misc/dsntypes.cxx
1 file changed, 6 insertions(+), 2 deletions(-)



diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index 77814e5..0c02d64 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -342,8 +342,12 @@
     sal_Int32 nSeparator = sDsn.indexOf(static_cast<sal_Unicode>(':'));
     if (-1 == nSeparator)
     {
-        // there should be at least one such separator
-        OSL_FAIL("ODsnTypeCollection::implDetermineType : missing the colon !");
+        if (!sDsn.isEmpty())
+        {
+            // there should be at least one such separator
+            OSL_FAIL("ODsnTypeCollection::implDetermineType : missing the colon !");
+        }
+
         return DST_UNKNOWN;
     }
 

-- 
To view, visit https://gerrit.libreoffice.org/2885
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9bcd025aab046e6cb79db47564f55ae3f0faed55
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mathias Hasselmann <mathias at openismus.com>