Skip to content

C
core
Kaydet (Commit) f9a05f4d authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Some mork driver clean-up and configmgr access fix 

Change-Id: I213a9ac5b41c66cd039016315f4641773364fd7c
üst 58d24271
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 155 deletions
connectivity/Library_mork.mk
Dosyayı görüntüle @ f9a05f4d
......@@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_sdk_api,mork))
$(eval $(call gb_Library_add_exception_objects,mork, \
connectivity/source/drivers/mork/MColumns \
connectivity/source/drivers/mork/MConfigAccess \
connectivity/source/drivers/mork/MColumnAlias \
connectivity/source/drivers/mork/MNSFolders \
connectivity/source/drivers/mork/MNSINIParser \
......
connectivity/registry/mork/org/openoffice/Office/DataAccess/Drivers.xcu
Dosyayı görüntüle @ f9a05f4d
......@@ -18,28 +18,6 @@
-->
<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<node oor:name="Installed" install:module="mork">
<node oor:name="sdbc:address:mozilla:" oor:op="replace">
<prop oor:name="Driver">
<value>com.sun.star.comp.sdbc.MozabDriver</value>
</prop>
<prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
<value xml:lang="en-US">SeaMonkey Address Book</value>
</prop>
<node oor:name="Features">
<node oor:name="EscapeDateTime" oor:op="replace">
<prop oor:name="Value" oor:type="xs:boolean">
<value>true</value>
</prop>
</node>
</node>
<node oor:name="MetaData">
<node oor:name="SupportsBrowsing" oor:op="replace">
<prop oor:name="Value" oor:type="xs:boolean">
<value>true</value>
</prop>
</node>
</node>
</node>
<node oor:name="sdbc:address:thunderbird:" oor:op="replace">
<prop oor:name="Driver">
<value>com.sun.star.comp.sdbc.MorkDriver</value>
......
connectivity/source/drivers/mork/MColumnAlias.cxx
Dosyayı görüntüle @ f9a05f4d
......@@ -20,10 +20,10 @@
#include <sal/macros.h>
#include "MColumnAlias.hxx"
#include "MConnection.hxx"
#include "MExtConfigAccess.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <officecfg/Office/DataAccess.hxx>
#include <tools/diagnose_ex.h>
......@@ -90,70 +90,38 @@ OColumnAlias::OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::
//------------------------------------------------------------------------------
void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB )
{
// open our driver settings config node
// the config path for our own driver's settings
Reference< XPropertySet > xDriverNode = createDriverConfigNode( _rxORB );
if ( xDriverNode.is() )
{
try
Reference< XNameAccess > xAliasesNode(
officecfg::Office::DataAccess::DriverSettings::
com_sun_star_comp_sdbc_MozabDriver::ColumnAliases::get(
comphelper::getComponentContext(_rxORB)),
UNO_QUERY_THROW);
Sequence< OUString > aProgrammaticNames(xAliasesNode->getElementNames());
for (sal_Int32 i = 0; i != aProgrammaticNames.getLength(); ++i) {
OString sAsciiProgrammaticName(
OUStringToOString(
aProgrammaticNames[i], RTL_TEXTENCODING_ASCII_US));
bool bFound = false;
for (AliasMap::iterator j(m_aAliasMap.begin()); j != m_aAliasMap.end();
++j)
{
//.............................................................
Reference< XNameAccess > xAliasesNode;
xDriverNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ColumnAliases")) ) >>= xAliasesNode;
OSL_ENSURE( xAliasesNode.is(), "OColumnAlias::setAlias: missing the aliases node!" );
// this is a set of string nodes
Sequence< ::rtl::OUString > aProgrammaticNames;
if ( xAliasesNode.is() )
aProgrammaticNames = xAliasesNode->getElementNames();
//.............................................................
// travel through all the set elements
const ::rtl::OUString* pProgrammaticNames = aProgrammaticNames.getConstArray();
const ::rtl::OUString* pProgrammaticNamesEnd = pProgrammaticNames + aProgrammaticNames.getLength();
::rtl::OUString sAssignedAlias;
for ( ; pProgrammaticNames < pProgrammaticNamesEnd; ++pProgrammaticNames )
{
OSL_VERIFY( xAliasesNode->getByName( *pProgrammaticNames ) >>= sAssignedAlias );
// normalize in case the config data is corrupted
// (what we really don't need is an empty alias ...)
if ( sAssignedAlias.isEmpty() )
sAssignedAlias = *pProgrammaticNames;
::rtl::OString sAsciiProgrammaticName( ::rtl::OUStringToOString( *pProgrammaticNames, RTL_TEXTENCODING_ASCII_US ) );
//.............................................................
#if OSL_DEBUG_LEVEL > 0
bool bFound = false;
#endif
for ( AliasMap::iterator search = m_aAliasMap.begin();
( search != m_aAliasMap.end() );
++search
)
{
if ( search->second.programmaticAsciiName.equals( sAsciiProgrammaticName ) )
{
AliasEntry entry( search->second );
m_aAliasMap.erase( search );
m_aAliasMap[ sAssignedAlias ] = entry;
#if OSL_DEBUG_LEVEL > 0
bFound = true;
#endif
break;
}
if (j->second.programmaticAsciiName == sAsciiProgrammaticName) {
OUString sAssignedAlias;
xAliasesNode->getByName(aProgrammaticNames[i]) >>=
sAssignedAlias;
if (sAssignedAlias.isEmpty()) {
sAssignedAlias = aProgrammaticNames[i];
}
OSL_ENSURE( bFound, "OColumnAlias::setAlias: did not find a programmatic name which exists in the configuration!" );
AliasEntry entry(j->second);
m_aAliasMap.erase(j);
m_aAliasMap[sAssignedAlias] = entry;
bFound = true;
break;
}
}
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
}
SAL_WARN_IF(
!bFound, "connectivity.mork",
"unknown programmatic name " << aProgrammaticNames[i]
<<" from configuration");
}
}
......
connectivity/source/drivers/mork/MConfigAccess.hxx deleted 100644 → 0
Dosyayı görüntüle @ 58d24271
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef CONNECTIVITY_MORK_MCONFIGACCESS_HXX
#include <sal/types.h>
extern "C" const sal_Unicode* SAL_CALL getUserProfile( void );
extern "C" const sal_Char* SAL_CALL getPabDescription( void );
extern "C" const sal_Char* SAL_CALL getHisDescription( void );
#endif // CONNECTIVITY_MORK_MCONFIGACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
connectivity/source/drivers/mork/MExtConfigAccess.hxx deleted 100644 → 0
Dosyayı görüntüle @ 58d24271
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef CONNECTIVITY_MORK_MEXTCONFIGACCESS_HXX
// This is the extended version (for use on the SO side of the driver) of MConfigAccess
// (which is for use on the mozilla side only)
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
namespace connectivity
{
namespace mork
{
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
createDriverConfigNode( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxORB );
}
}
#endif // CONNECTIVITY_MORK_MEXTCONFIGACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment