From d1e4caf97326f1712f08627136248e5899962a33 Mon Sep 17 00:00:00 2001
From: Frank Schönheit <fs@openoffice.org>
Date: Thu, 7 Jan 2010 09:56:59 +0000
Subject: #i108123# getDataSourcePrefixFromMediaType: care for types where the
 config says 'no extension', but the actual file contains an extension

---
 dbaccess/source/core/misc/dsntypes.cxx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index f81dc020b05f..90294dd59869 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -185,7 +185,7 @@ String ODsnTypeCollection::getMediaType(const ::rtl::OUString& _sURL) const
 // -----------------------------------------------------------------------------
 String ODsnTypeCollection::getDatasourcePrefixFromMediaType(const ::rtl::OUString& _sMediaType,const ::rtl::OUString& _sExtension)
 {
-    String sURL;
+    String sURL, sFallbackURL;
     const uno::Sequence< ::rtl::OUString > aURLs = m_aDriverConfig.getURLs();
     const ::rtl::OUString* pIter = aURLs.getConstArray();
     const ::rtl::OUString* pEnd = pIter + aURLs.getLength();
@@ -200,8 +200,14 @@ String ODsnTypeCollection::getDatasourcePrefixFromMediaType(const ::rtl::OUStrin
                 sURL = *pIter;
                 break;
             }
+            if ( !sFileExtension.getLength() && _sExtension.getLength() )
+                sFallbackURL = *pIter;
         }
     } // for(;pIter != pEnd;++pIter )
+
+    if ( !sURL.Len() && sFallbackURL.Len() )
+        sURL = sFallbackURL;
+
     sURL.EraseTrailingChars('*');
     return sURL;
 }
-- 
cgit