summaryrefslogtreecommitdiff
path: root/connectivity/inc
diff options
context:
space:
mode:
authorMatthew Nicholls <matthew.nicholls95@hotmail.co.uk>2015-04-19 17:12:43 +0100
committerDavid Tardon <dtardon@redhat.com>2015-04-22 07:25:17 +0000
commita1a25f4c6c99c0c519cc60d842041d56ae8a6f1c (patch)
treeb673a96ed3bf88c107b4a6049b9373af772026fb /connectivity/inc
parent81f9281de0b5b42d5f4e8f1c4ecb3a780c74ff95 (diff)
tdf#88710 Cleanup after removing dbtoolsclient
Removes "virtualdbtools" and its implementation under "simpledbt", which are mostly wrappers around various dbtools functions and classes, previously aiding the now removed dynamic loading logic. Removes IDataAccessTools, IDataAccessTypeConversion and IDataAccessToolsFactory interfaces and their accompanying implementations which are completely unused. Removes IDataAccessCharSet (implemented by ODataAccessCharSet) and moves the implementation into a function which replaces ODataAccessCharsetHelper. Removes ISQLParseNode and ISQLParser and their implementation in OSimpleParseNode and OSimpleSQLParser, which simply wrap around OSQLParseNode and OSQLParser respectively. To avoid including "sqlbison.hxx" unnecessarily, includes to "sqlbison.hxx" are now only used where needed. Change-Id: Id882dfbf43514d84a1eaffc1f916d627830c8cd6 Reviewed-on: https://gerrit.libreoffice.org/15450 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'connectivity/inc')
-rw-r--r--connectivity/inc/simpledbt/charset_s.hxx54
-rw-r--r--connectivity/inc/simpledbt/parser_s.hxx60
2 files changed, 0 insertions, 114 deletions
diff --git a/connectivity/inc/simpledbt/charset_s.hxx b/connectivity/inc/simpledbt/charset_s.hxx
deleted file mode 100644
index 25aa2bfc7630..000000000000
--- a/connectivity/inc/simpledbt/charset_s.hxx
+++ /dev/null
@@ -1,54 +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 .
- */
-
-#ifndef INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_CHARSET_S_HXX
-#define INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_CHARSET_S_HXX
-
-#include <connectivity/virtualdbtools.hxx>
-#include <connectivity/dbcharset.hxx>
-
-
-namespace connectivity
-{
-
-
-
- //= ODataAccessCharSet
-
- class ODataAccessCharSet : public simple::IDataAccessCharSet
- {
- protected:
- ::dbtools::OCharsetMap m_aCharsetInfo;
-
- public:
- ODataAccessCharSet() { }
-
- // IDataAccessCharSet
- sal_Int32 getSupportedTextEncodings(
- ::std::vector< rtl_TextEncoding >& /* [out] */ _rEncs
- ) const SAL_OVERRIDE;
- };
-
-
-} // namespace connectivity
-
-
-#endif // INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_CHARSET_S_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/inc/simpledbt/parser_s.hxx b/connectivity/inc/simpledbt/parser_s.hxx
deleted file mode 100644
index 359ab25c6366..000000000000
--- a/connectivity/inc/simpledbt/parser_s.hxx
+++ /dev/null
@@ -1,60 +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 .
- */
-
-#ifndef INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_PARSER_S_HXX
-#define INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_PARSER_S_HXX
-
-#include <connectivity/virtualdbtools.hxx>
-#include <connectivity/sqlparse.hxx>
-
-
-namespace connectivity
-{
-
-
-
- //= OSimpleSQLParser
-
- class OSimpleSQLParser : public simple::ISQLParser
- {
- protected:
- OSQLParser m_aFullParser;
-
- public:
- OSimpleSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const IParseContext* _pContext);
-
- // ISQLParser
- virtual ::rtl::Reference< simple::ISQLParseNode > predicateTree(
- OUString& rErrorMessage,
- const OUString& rStatement,
- const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField
- ) const SAL_OVERRIDE;
-
- virtual const IParseContext& getContext() const SAL_OVERRIDE;
- };
-
-
-} // namespace connectivity
-
-
-#endif // INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_PARSER_S_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */