[Libreoffice-commits] core.git: 2 commits - dbaccess/source

[akki95]

 dbaccess/source/core/misc/dsntypes.cxx         |    2 +-
 dbaccess/source/inc/dsntypes.hxx               |   12 ++++++------
 dbaccess/source/ui/dlg/ConnectionPageSetup.cxx |    5 +++++
 3 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 82b4afb4295a58c1afee39877a894136d68111ec
Author: akki95 <akshaydeepiitr at gmail.com>
Date:   Tue Jan 26 03:52:42 2016 +0530

    whitespace fixup
    
    Change-Id: Ia5a2cd92e069c038f4ff0c97876b95c5d81e4db1

diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index 8f90a1a..fe94d2e 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -401,7 +401,7 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const OUString& _rDsn) const
         KnownPrefix( "sdbc:mysql:jdbc:",    DST_MYSQL_JDBC,         false ),
         KnownPrefix( "sdbc:mysql:mysqlc:",  DST_MYSQL_NATIVE,       false ),
         KnownPrefix( "sdbc:mysqlc:",        DST_MYSQL_NATIVE_DIRECT,false ),
-        KnownPrefix( "sdbc:postgresql:",    DST_POSTGRES,false ),
+        KnownPrefix( "sdbc:postgresql:",    DST_POSTGRES           ,false ),
 
         KnownPrefix( "sdbc:address:mozilla:",           DST_MOZILLA,            true ),
         KnownPrefix( "sdbc:address:thunderbird:",       DST_THUNDERBIRD,        true ),
diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx
index 9ce1f7c..8de9a93 100644
--- a/dbaccess/source/inc/dsntypes.hxx
+++ b/dbaccess/source/inc/dsntypes.hxx
@@ -46,22 +46,22 @@ enum DATASOURCE_TYPE
     DST_ODBC                = 10,
     DST_ADO                 = 11,
     DST_MOZILLA             = 12,
-     DST_THUNDERBIRD         = 13,
+    DST_THUNDERBIRD         = 13,
     DST_LDAP                = 14,
     DST_OUTLOOK             = 15,
     DST_OUTLOOKEXP          = 16,
     DST_EVOLUTION           = 17,
     DST_EVOLUTION_GROUPWISE = 18,
     DST_EVOLUTION_LDAP      = 19,
-     DST_KAB                 = 20,
-     DST_MACAB               = 21,
+    DST_KAB                 = 20,
+    DST_MACAB               = 21,
     DST_MSACCESS_2007       = 22,
-     DST_EMBEDDED_HSQLDB    = 23,
+    DST_EMBEDDED_HSQLDB     = 23,
     DST_MYSQL_NATIVE        = 24,
     DST_MYSQL_NATIVE_DIRECT = 25,
     DST_FIREBIRD            = 26,
-    DST_EMBEDDED_FIREBIRD    = 27,
-    DST_POSTGRES = 28,
+    DST_EMBEDDED_FIREBIRD   = 27,
+    DST_POSTGRES            = 28,
 
     DST_USERDEFINE1,    /// first user defined driver
     DST_USERDEFINE2,
commit 90e18b514f639827091cee0f04892d999046eb18
Author: akki95 <akshaydeepiitr at gmail.com>
Date:   Tue Jan 26 03:52:42 2016 +0530

    tdf#45775 PgSQL new DB allow empty Datasource
    
    Change-Id: I5d672629ddf7f153f0ad1927f0f6c0ffc545c3ab

diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 21e1ea3..864b406 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -138,6 +138,9 @@ namespace dbaui
         //! TODO
         //if (  ::dbaccess::DST_ORACLE_JDBC == m_eType )
         //    m_eType =  ::dbaccess::DST_JDBC;
+        if(m_pCollection->determineType(m_eType) == ::dbaccess::DST_POSTGRES){
+            SetRoadmapStateValue(true);
+        }
 
         OConnectionHelper::implInitControls(_rSet, _bSaveValue);
 
@@ -168,6 +171,8 @@ namespace dbaui
     }
     bool OConnectionTabPageSetup::checkTestConnection()
     {
+        if ( m_pCollection->determineType(m_eType) ==  ::dbaccess::DST_POSTGRES )
+            return true;
         return !m_pConnectionURL->IsVisible() || !m_pConnectionURL->GetTextNoPrefix().isEmpty();
     }