diff options
Diffstat (limited to 'connectivity/source/simpledbt')
-rw-r--r-- | connectivity/source/simpledbt/charset_s.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/simpledbt/charset_s.hxx | 54 | ||||
-rw-r--r-- | connectivity/source/simpledbt/dbtfactory.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/simpledbt/parser_s.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/simpledbt/parser_s.hxx | 60 |
5 files changed, 4 insertions, 118 deletions
diff --git a/connectivity/source/simpledbt/charset_s.cxx b/connectivity/source/simpledbt/charset_s.cxx index 2843b674e6f9..261a46a59c8f 100644 --- a/connectivity/source/simpledbt/charset_s.cxx +++ b/connectivity/source/simpledbt/charset_s.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "charset_s.hxx" +#include "simpledbt/charset_s.hxx" namespace connectivity diff --git a/connectivity/source/simpledbt/charset_s.hxx b/connectivity/source/simpledbt/charset_s.hxx deleted file mode 100644 index 25aa2bfc7630..000000000000 --- a/connectivity/source/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/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx index cead9fab7fe8..85fca69453e7 100644 --- a/connectivity/source/simpledbt/dbtfactory.cxx +++ b/connectivity/source/simpledbt/dbtfactory.cxx @@ -20,10 +20,10 @@ #include <connectivity/virtualdbtools.hxx> #include <connectivity/formattedcolumnvalue.hxx> +#include "simpledbt/parser_s.hxx" +#include "simpledbt/charset_s.hxx" #include "dbtfactory.hxx" -#include "parser_s.hxx" #include "staticdbtools_s.hxx" -#include "charset_s.hxx" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/simpledbt/parser_s.cxx b/connectivity/source/simpledbt/parser_s.cxx index eddae295e7cb..e9194af045bf 100644 --- a/connectivity/source/simpledbt/parser_s.cxx +++ b/connectivity/source/simpledbt/parser_s.cxx @@ -18,7 +18,7 @@ */ #include <connectivity/virtualdbtools.hxx> -#include "parser_s.hxx" +#include "simpledbt/parser_s.hxx" #include "parsenode_s.hxx" using namespace ::com::sun::star::uno; diff --git a/connectivity/source/simpledbt/parser_s.hxx b/connectivity/source/simpledbt/parser_s.hxx deleted file mode 100644 index 359ab25c6366..000000000000 --- a/connectivity/source/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: */ |