From fddc55cc896fc9d47cadd1b89ab1c24b6d19721f Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Mon, 14 May 2018 17:45:23 +0200 Subject: fix typo the header is already ParameterSubstitution.hxx... Change-Id: I13239681fbdee6d79aae67f7b7291fe5f7ee78ee Reviewed-on: https://gerrit.libreoffice.org/54333 Tested-by: Jenkins Reviewed-by: Rene Engelhard --- connectivity/Library_dbtools.mk | 2 +- .../source/commontools/ParameterSubstitution.cxx | 116 +++++++++++++++++++++ .../source/commontools/ParamterSubstitution.cxx | 116 --------------------- 3 files changed, 117 insertions(+), 117 deletions(-) create mode 100644 connectivity/source/commontools/ParameterSubstitution.cxx delete mode 100644 connectivity/source/commontools/ParamterSubstitution.cxx (limited to 'connectivity') diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 3136a22c908b..79723037a5db 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -77,7 +77,7 @@ $(eval $(call gb_Library_add_exception_objects,dbtools,\ connectivity/source/commontools/FDatabaseMetaDataResultSet \ connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData \ connectivity/source/commontools/FValue \ - connectivity/source/commontools/ParamterSubstitution \ + connectivity/source/commontools/ParameterSubstitution \ connectivity/source/commontools/RowFunctionParser \ connectivity/source/commontools/TColumnsHelper \ connectivity/source/commontools/TConnection \ diff --git a/connectivity/source/commontools/ParameterSubstitution.cxx b/connectivity/source/commontools/ParameterSubstitution.cxx new file mode 100644 index 000000000000..dfec360b23e5 --- /dev/null +++ b/connectivity/source/commontools/ParameterSubstitution.cxx @@ -0,0 +1,116 @@ +/* -*- 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 . + */ +#include +#include +#include +#include + +namespace connectivity +{ + using namespace ::com::sun::star::uno; + using namespace ::com::sun::star::sdbc; + using namespace ::com::sun::star::lang; + using namespace ::com::sun::star; + + ParameterSubstitution::ParameterSubstitution(const css::uno::Reference< css::uno::XComponentContext >& _rxContext ) : m_xContext(_rxContext) + { + } + void SAL_CALL ParameterSubstitution::initialize( const uno::Sequence< uno::Any >& _aArguments ) + { + ::osl::MutexGuard aGuard(m_aMutex); + comphelper::SequenceAsHashMap aArgs(_aArguments); + uno::Reference< sdbc::XConnection > xConnection; + xConnection = aArgs.getUnpackedValueOrDefault("ActiveConnection",xConnection); + m_xConnection = xConnection; + } + + OUString ParameterSubstitution::getImplementationName_Static( ) + { + return OUString("org.openoffice.comp.helper.ParameterSubstitution"); + } + + OUString SAL_CALL ParameterSubstitution::getImplementationName( ) + { + return getImplementationName_Static(); + } + + sal_Bool SAL_CALL ParameterSubstitution::supportsService( const OUString& _rServiceName ) + { + return cppu::supportsService(this, _rServiceName); + } + + Sequence< OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames( ) + { + return getSupportedServiceNames_Static(); + } + + Sequence< OUString > ParameterSubstitution::getSupportedServiceNames_Static( ) + { + Sequence aSNS { "com.sun.star.sdb.ParameterSubstitution" }; + return aSNS; + } + + + Reference< XInterface > ParameterSubstitution::create(const Reference< XComponentContext >& _xContext) + { + return *(new ParameterSubstitution(_xContext)); + } + + OUString SAL_CALL ParameterSubstitution::substituteVariables( const OUString& _sText, sal_Bool /*bSubstRequired*/ ) + { + OUString sRet = _sText; + uno::Reference< sdbc::XConnection > xConnection = m_xConnection; + if ( xConnection.is() ) + { + try + { + OSQLParser aParser( m_xContext ); + OUString sErrorMessage; + OUString sNewSql; + OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,_sText); + if(pNode) + { // special handling for parameters + OSQLParseNode::substituteParameterNames(pNode); + pNode->parseNodeToStr( sNewSql, xConnection ); + delete pNode; + sRet = sNewSql; + } + } + catch(const Exception&) + { + } + } + return sRet; + } + + OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const OUString& _sText ) + { + return _sText; + } + + OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const OUString& /*variable*/ ) + { + throw container::NoSuchElementException(); + } + + +} // connectivity + + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx deleted file mode 100644 index dfec360b23e5..000000000000 --- a/connectivity/source/commontools/ParamterSubstitution.cxx +++ /dev/null @@ -1,116 +0,0 @@ -/* -*- 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 . - */ -#include -#include -#include -#include - -namespace connectivity -{ - using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::sdbc; - using namespace ::com::sun::star::lang; - using namespace ::com::sun::star; - - ParameterSubstitution::ParameterSubstitution(const css::uno::Reference< css::uno::XComponentContext >& _rxContext ) : m_xContext(_rxContext) - { - } - void SAL_CALL ParameterSubstitution::initialize( const uno::Sequence< uno::Any >& _aArguments ) - { - ::osl::MutexGuard aGuard(m_aMutex); - comphelper::SequenceAsHashMap aArgs(_aArguments); - uno::Reference< sdbc::XConnection > xConnection; - xConnection = aArgs.getUnpackedValueOrDefault("ActiveConnection",xConnection); - m_xConnection = xConnection; - } - - OUString ParameterSubstitution::getImplementationName_Static( ) - { - return OUString("org.openoffice.comp.helper.ParameterSubstitution"); - } - - OUString SAL_CALL ParameterSubstitution::getImplementationName( ) - { - return getImplementationName_Static(); - } - - sal_Bool SAL_CALL ParameterSubstitution::supportsService( const OUString& _rServiceName ) - { - return cppu::supportsService(this, _rServiceName); - } - - Sequence< OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames( ) - { - return getSupportedServiceNames_Static(); - } - - Sequence< OUString > ParameterSubstitution::getSupportedServiceNames_Static( ) - { - Sequence aSNS { "com.sun.star.sdb.ParameterSubstitution" }; - return aSNS; - } - - - Reference< XInterface > ParameterSubstitution::create(const Reference< XComponentContext >& _xContext) - { - return *(new ParameterSubstitution(_xContext)); - } - - OUString SAL_CALL ParameterSubstitution::substituteVariables( const OUString& _sText, sal_Bool /*bSubstRequired*/ ) - { - OUString sRet = _sText; - uno::Reference< sdbc::XConnection > xConnection = m_xConnection; - if ( xConnection.is() ) - { - try - { - OSQLParser aParser( m_xContext ); - OUString sErrorMessage; - OUString sNewSql; - OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,_sText); - if(pNode) - { // special handling for parameters - OSQLParseNode::substituteParameterNames(pNode); - pNode->parseNodeToStr( sNewSql, xConnection ); - delete pNode; - sRet = sNewSql; - } - } - catch(const Exception&) - { - } - } - return sRet; - } - - OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const OUString& _sText ) - { - return _sText; - } - - OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const OUString& /*variable*/ ) - { - throw container::NoSuchElementException(); - } - - -} // connectivity - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit