strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use more officecfg in OSDBCDriverManager

Browse source 
Change-Id: I2b1758572a6436d829d547d60bca5fa2d1a3c98f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167641
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
This commit is contained in:
Noel Grandin 2024-05-14 19:30:05 +02:00 committed by Noel Grandin
parent 9f4dd488e7
commit 0b8f585f8a
2 changed files with 7 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
connectivity/Library_sdbc2.mk
View file

@ -14,6 +14,10 @@ $(eval $(call gb_Library_set_componentfile,sdbc2,connectivity/source/manager/sdb
$(eval $(call gb_Library_use_external,sdbc2,boost_headers)) $(eval $(call gb_Library_use_external,sdbc2,boost_headers))
$(eval $(call gb_Library_use_custom_headers,sdbc2,\
officecfg/registry \
))
$(eval $(call gb_Library_use_sdk_api,sdbc2)) $(eval $(call gb_Library_use_sdk_api,sdbc2))
$(eval $(call gb_Library_set_include,sdbc2,\ $(eval $(call gb_Library_set_include,sdbc2,\

42
connectivity/source/manager/mdrivermanager.cxx
View file

@ -32,6 +32,7 @@
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <officecfg/Office/DataAccess.hxx>
#include <algorithm> #include <algorithm>
#include <iterator> #include <iterator>
@ -158,43 +159,6 @@ namespace
return _rDriver.is() && _rDriver->acceptsURL( _rURL ); return _rDriver.is() && _rDriver->acceptsURL( _rURL );
} }
#if !ENABLE_FUZZERS
sal_Int32 lcl_getDriverPrecedence( const Reference<XComponentContext>& _rContext, Sequence< OUString >& _rPrecedence )
{
_rPrecedence.realloc( 0 );
try
{
// create a configuration provider
Reference< XMultiServiceFactory > xConfigurationProvider(
css::configuration::theDefaultProvider::get( _rContext ) );
// one argument for creating the node access: the path to the configuration node
Sequence< Any > aCreationArgs{ Any(NamedValue(
u"nodepath"_ustr, Any( u"org.openoffice.Office.DataAccess/DriverManager"_ustr ) )) };
// create the node access
Reference< XNameAccess > xDriverManagerNode(
xConfigurationProvider->createInstanceWithArguments(u"com.sun.star.configuration.ConfigurationAccess"_ustr, aCreationArgs),
UNO_QUERY);
OSL_ENSURE(xDriverManagerNode.is(), "lcl_getDriverPrecedence: could not open my configuration node!");
if (xDriverManagerNode.is())
{
// obtain the preference list
Any aPreferences = xDriverManagerNode->getByName(u"DriverPrecedence"_ustr);
bool bSuccess = aPreferences >>= _rPrecedence;
OSL_ENSURE(bSuccess || !aPreferences.hasValue(), "lcl_getDriverPrecedence: invalid value for the preferences node (no string sequence but not NULL)!");
}
}
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION("connectivity.manager");
}
return _rPrecedence.getLength();
}
#endif
/// an STL algorithm compatible predicate comparing two DriverAccess instances by their implementation names /// an STL algorithm compatible predicate comparing two DriverAccess instances by their implementation names
struct CompareDriverAccessByName struct CompareDriverAccessByName
{ {
@ -318,8 +282,8 @@ void OSDBCDriverManager::initializeDriverPrecedence()
try try
{ {
// get the precedence of the drivers from the configuration // get the precedence of the drivers from the configuration
Sequence< OUString > aDriverOrder; Sequence< OUString > aDriverOrder = officecfg::Office::DataAccess::DriverManager::DriverPrecedence::get();
if ( 0 == lcl_getDriverPrecedence( m_xContext, aDriverOrder ) ) if ( 0 == aDriverOrder.getLength() )
// nothing to do // nothing to do
return; return;