4 files changed, 5 insertions, 68 deletions
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index aeca5a029655..ee394325d74c 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -282,27 +282,9 @@ bool ODsnTypeCollection::isEmbeddedDatabase( const OUString& _sURL )
     return _sURL.startsWith( "sdbc:embedded:" );
 }
 
-OUString ODsnTypeCollection::getEmbeddedDatabase() const
+OUString ODsnTypeCollection::getEmbeddedDatabase()
 {
-    OUString sEmbeddedDatabaseURL;
-    const ::utl::OConfigurationTreeRoot aInstalled = ::utl::OConfigurationTreeRoot::createWithComponentContext(m_xContext, "org.openoffice.Office.DataAccess", -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
-    if ( aInstalled.isValid() )
-    {
-        if ( aInstalled.hasByName("EmbeddedDatabases/DefaultEmbeddedDatabase/Value") )
-        {
-            static const OUStringLiteral s_sValue = "EmbeddedDatabases/DefaultEmbeddedDatabase/Value";
-
-            aInstalled.getNodeValue(s_sValue) >>= sEmbeddedDatabaseURL;
-            if ( !sEmbeddedDatabaseURL.isEmpty() )
-                aInstalled.getNodeValue(s_sValue + "/" + sEmbeddedDatabaseURL + "/URL") >>= sEmbeddedDatabaseURL;
-        }
-    }
-    if ( sEmbeddedDatabaseURL.isEmpty() )
-    {
-        sEmbeddedDatabaseURL = "sdbc:embedded:firebird";
-    }
-
-    return sEmbeddedDatabaseURL;
+    return "sdbc:embedded:firebird";
 }
 
 
diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx
index fe64a933d77e..8ce435285bfe 100644
--- a/dbaccess/source/inc/dsntypes.hxx
+++ b/dbaccess/source/inc/dsntypes.hxx
@@ -160,7 +160,7 @@ public:
     /// checks if the given data source type embeds its data into the database document
     static bool isEmbeddedDatabase( const OUString& _sURL );
 
-    OUString getEmbeddedDatabase() const;
+    static OUString getEmbeddedDatabase();
 
     // returns true when the properties dialog can be shown, otherwise false.
     static bool isShowPropertiesEnabled( const OUString& _sURL );
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index ba609c6a89b4..567b1a2d65ae 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -251,7 +251,7 @@ namespace dbaui
 
         if (m_pCollection && bValid)
         {
-            implSetCurrentType( m_pCollection->getEmbeddedDatabase() );
+            implSetCurrentType( dbaccess::ODsnTypeCollection::getEmbeddedDatabase() );
             sDisplayName = m_pCollection->getTypeDisplayName( m_eCurrentSelection );
         }
 
@@ -486,7 +486,7 @@ namespace dbaui
         get( m_pPB_OpenDatabase, "openDatabase" );
 
         // If no driver for embedded DBs is installed, and no dBase driver, then hide the "Create new database" option
-        sal_Int32 nCreateNewDBIndex = m_pCollection->getIndexOf( m_pCollection->getEmbeddedDatabase() );
+        sal_Int32 nCreateNewDBIndex = m_pCollection->getIndexOf( dbaccess::ODsnTypeCollection::getEmbeddedDatabase() );
         if ( nCreateNewDBIndex == -1 )
             nCreateNewDBIndex = m_pCollection->getIndexOf( "sdbc:dbase:" );
         bool bHideCreateNew = ( nCreateNewDBIndex == -1 );
diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
index 98a581786d32..e2591ee34aea 100644
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
@@ -38,16 +38,6 @@
         </info>
       </prop>
     </group>
-    <group oor:name="EmbeddedDatabaseSetting">
-      <info>
-        <desc>Describes a setting for an embedded database.</desc>
-      </info>
-      <prop oor:name="Value" oor:type="oor:any">
-        <info>
-          <desc>Describes the value for an embedded database setting.</desc>
-        </info>
-      </prop>
-    </group>
     <group oor:name="ReportEngineName">
       <info>
         <desc>Describes the report engine.</desc>
@@ -63,26 +53,6 @@
         </info>
       </prop>
     </group>
-    <group oor:name="EmbeddedDatabaseName">
-      <info>
-        <desc>Describes the URL schema for an embedded database. They must start with sdbc:embedded:.</desc>
-      </info>
-      <prop oor:name="URL" oor:type="xs:string">
-        <info>
-          <desc>Specifies the URL for the embedded database.</desc>
-        </info>
-      </prop>
-      <prop oor:name="UIName" oor:type="xs:string" oor:localized="true">
-        <info>
-          <desc>Specifies the name of the embedded database which will be displayed in the statusbar of the database application.</desc>
-        </info>
-      </prop>
-      <set oor:name="EmbeddedDatabaseSettings" oor:node-type="EmbeddedDatabaseSetting">
-        <info>
-          <desc>Specifies the settings of an embedded database.</desc>
-        </info>
-      </set>
-    </group>
     <group oor:name="DataSource">
       <info>
         <desc>Specifies the data source to be used for the bibliography.</desc>
@@ -240,21 +210,6 @@
         </info>
       </set>
     </group>
-    <group oor:name="EmbeddedDatabases">
-      <info>
-        <desc>Specifies the default embedded database which should be used.</desc>
-      </info>
-      <prop oor:name="DefaultEmbeddedDatabase" oor:type="xs:string">
-        <info>
-          <desc>Specifies the name of the embedded database to use.</desc>
-        </info>
-      </prop>
-      <set oor:name="EmbeddedDatabaseNames" oor:node-type="EmbeddedDatabaseName">
-        <info>
-          <desc>Specifies all embedded database names which are registered.</desc>
-        </info>
-      </set>
-    </group>
     <group oor:name="DriverManager">
       <info>
         <desc>Specifies additional information about the database drivers.</desc>