connectivity/CppunitTest_connectivity_commontools.mk | 1 +
connectivity/Library_dbase.mk | 1 +
connectivity/Library_dbtools.mk | 1 +
connectivity/Library_firebird_sdbc.mk | 1 +
connectivity/source/commontools/DriversConfig.cxx | 9 +++++++--
connectivity/source/drivers/firebird/Driver.cxx | 14 +++++++++-----
dbaccess/CppunitTest_dbaccess_firebird_test.mk | 1 +
dbaccess/qa/unit/firebird.cxx | 10 ++++++++++
dbaccess/source/ui/dlg/generalpage.cxx | 2 +-
9 files changed, 32 insertions(+), 8 deletions(-)
New commits:
commit 516f9b013ff275ee66a81e02efb0cf989de8d33e
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Sat Nov 9 18:40:10 2013 +0100
indentation
Change-Id: Idec97e6b9269cb481428bef8b95aa112197fe866
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx
b/dbaccess/source/ui/dlg/generalpage.cxx
index 565870f..1d73437 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -143,7 +143,7 @@ namespace dbaui
if ( m_bInitEmbeddedDBList )
{
m_bInitEmbeddedDBList = false;
- m_pEmbeddedDBType->Clear();
+ m_pEmbeddedDBType->Clear();
if ( m_pCollection )
{
commit 79bd39ac61746c58685be407b597e966d7369fb2
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Sat Nov 9 18:39:56 2013 +0100
fdo#65108 inter-module includes <>
Change-Id: Ie8ca0b1aa7b56ea1d62c9eed798c56ca78464c44
diff --git a/connectivity/source/commontools/DriversConfig.cxx
b/connectivity/source/commontools/DriversConfig.cxx
index b1cb506..bf70fba 100644
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "connectivity/DriversConfig.hxx"
+#include <connectivity/DriversConfig.hxx>
#include <tools/wldcrd.hxx>
#include <svtools/miscopt.hxx>
diff --git a/connectivity/source/drivers/firebird/Driver.cxx
b/connectivity/source/drivers/firebird/Driver.cxx
index 932eae6..63e884c 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -20,10 +20,10 @@
#include "Connection.hxx"
#include "Driver.hxx"
-#include "connectivity/dbexception.hxx"
-#include "resource/common_res.hrc"
-#include "resource/hsqldb_res.hrc"
-#include "resource/sharedresources.hxx"
+#include <connectivity/dbexception.hxx>
+#include <resource/common_res.hrc>
+#include <resource/hsqldb_res.hrc>
+#include <resource/sharedresources.hxx>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/supportsservice.hxx>
commit 7b9a9a49862e4ec42ab9ffd85f94713960a94c3a
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Sat Nov 9 18:39:18 2013 +0100
make firebird-sdbc an experimental feature
Change-Id: I0f2453e23d18597cfe1ad2a4cd4902b15f0a8f7d
diff --git a/connectivity/CppunitTest_connectivity_commontools.mk
b/connectivity/CppunitTest_connectivity_commontools.mk
index 1fbcee4..dc726dc 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -53,6 +53,7 @@ $(eval $(call
gb_CppunitTest_use_libraries,connectivity_commontools, \
unotest \
utl \
tl \
+ svt \
$(gb_UWINAPI) \
))
diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
index c19731d..059a723 100644
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,dbase,\
file \
utl \
comphelper \
+ svt \
$(gb_UWINAPI) \
))
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 22d5833..c4708b8 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,dbtools,\
comphelper \
i18nlangtag \
$(gb_UWINAPI) \
+ svt \
))
ifeq ($(filter-out NETBSD MACOSX,$(OS)),)
diff --git a/connectivity/Library_firebird_sdbc.mk
b/connectivity/Library_firebird_sdbc.mk
index b1fbf79..3f46e6e 100644
--- a/connectivity/Library_firebird_sdbc.mk
+++ b/connectivity/Library_firebird_sdbc.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,firebird_sdbc, \
sal \
salhelper \
utl \
+ svt \
vcl \
$(gb_UWINAPI) \
))
diff --git a/connectivity/source/commontools/DriversConfig.cxx
b/connectivity/source/commontools/DriversConfig.cxx
index 7d0f576..b1cb506 100644
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
@@ -18,6 +18,7 @@
*/
#include "connectivity/DriversConfig.hxx"
#include <tools/wldcrd.hxx>
+#include <svtools/miscopt.hxx>
using namespace connectivity;
using namespace utl;
@@ -102,6 +103,8 @@ void DriversConfigImpl::Load(const uno::Reference<
uno::XComponentContext >& _rx
if ( m_aInstalled.isValid() )
{
+ SvtMiscOptions aMiscOptions;
+
const uno::Sequence< OUString > aURLPatterns =
m_aInstalled.getNodeNames();
const OUString* pPatternIter = aURLPatterns.getConstArray();
const OUString* pPatternEnd = pPatternIter +
aURLPatterns.getLength();
@@ -109,7 +112,9 @@ void DriversConfigImpl::Load(const uno::Reference<
uno::XComponentContext >& _rx
{
TInstalledDriver aInstalledDriver;
lcl_readURLPatternNode(m_aInstalled,*pPatternIter,aInstalledDriver);
- if ( !aInstalledDriver.sDriverFactory.isEmpty() )
+ if ( !aInstalledDriver.sDriverFactory.isEmpty() &&
+ ( aMiscOptions.IsExperimentalMode() ||
+
!aInstalledDriver.sDriverFactory.equals("com.sun.star.comp.sdbc.firebird.Driver")
))
m_aDrivers.insert(TInstalledDrivers::value_type(*pPatternIter,aInstalledDriver));
}
} // if ( m_aInstalled.isValid() )
diff --git a/connectivity/source/drivers/firebird/Driver.cxx
b/connectivity/source/drivers/firebird/Driver.cxx
index b15514c..932eae6 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -28,6 +28,7 @@
#include <comphelper/processfactory.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <osl/process.h>
+#include <svtools/miscopt.hxx>
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -153,7 +154,10 @@ Reference< XConnection > SAL_CALL FirebirdDriver::connect(
sal_Bool SAL_CALL FirebirdDriver::acceptsURL( const OUString& url )
throw(SQLException, RuntimeException)
{
- return url.equals("sdbc:embedded:firebird") ||
url.startsWith("sdbc:firebird:");
+ SvtMiscOptions aMiscOptions;
+
+ return aMiscOptions.IsExperimentalMode() &&
+ (url.equals("sdbc:embedded:firebird") ||
url.startsWith("sdbc:firebird:"));
}
Sequence< DriverPropertyInfo > SAL_CALL FirebirdDriver::getPropertyInfo(
diff --git a/dbaccess/CppunitTest_dbaccess_firebird_test.mk
b/dbaccess/CppunitTest_dbaccess_firebird_test.mk
index 157a019..1cb545d 100644
--- a/dbaccess/CppunitTest_dbaccess_firebird_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_firebird_test.mk
@@ -22,6 +22,7 @@ $(eval $(call
gb_CppunitTest_use_libraries,dbaccess_firebird_test, \
firebird_sdbc \
sal \
subsequenttest \
+ svt \
test \
unotest \
xo \
diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx
index 78b7e66..a585270 100644
--- a/dbaccess/qa/unit/firebird.cxx
+++ b/dbaccess/qa/unit/firebird.cxx
@@ -15,6 +15,7 @@
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XStatement.hpp>
+#include <svtools/miscopt.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::sdb;
@@ -28,12 +29,21 @@ public:
void testEmptyDBConnection();
void testIntegerDatabase();
+ virtual void setUp();
+
CPPUNIT_TEST_SUITE(FirebirdTest);
CPPUNIT_TEST(testEmptyDBConnection);
CPPUNIT_TEST(testIntegerDatabase);
CPPUNIT_TEST_SUITE_END();
};
+void FirebirdTest::setUp()
+{
+ DBTestBase::setUp();
+ SvtMiscOptions aMiscOptions;
+ aMiscOptions.SetExperimentalMode(sal_True);
+}
+
/**
* Test the loading of an "empty" file, i.e. the embedded database has not yet
* been initialised (as occurs when a new .odb is created and opened by base).
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
