diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-07-10 20:44:17 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-07-10 20:48:49 +0300 |
commit | a0c50b739c79d41e8166e2dab862dca0d093e7c3 (patch) | |
tree | f6b5e1e73cdfd89a15a9e9c46cc8dc39b8749420 /connectivity/source/inc | |
parent | 986b39aa4f9ccafc4aafb0c4959832ad47aa83c9 (diff) |
Further fallout from the connectivity SQL parser changes
A couple of headers now need to be public because they are indirectly
included in other modules.
Change-Id: Id01945197b67183a0a042e854289875ae147a0eb
Diffstat (limited to 'connectivity/source/inc')
-rw-r--r-- | connectivity/source/inc/internalnode.hxx | 51 | ||||
-rw-r--r-- | connectivity/source/inc/parse/sqlbison_exports.hxx | 23 | ||||
-rw-r--r-- | connectivity/source/inc/sqlscan.hxx | 83 |
3 files changed, 0 insertions, 157 deletions
diff --git a/connectivity/source/inc/internalnode.hxx b/connectivity/source/inc/internalnode.hxx deleted file mode 100644 index be605e23761c..000000000000 --- a/connectivity/source/inc/internalnode.hxx +++ /dev/null @@ -1,51 +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 _CONNECTIVITY_SQLINTERNALNODE_HXX -#define _CONNECTIVITY_SQLINTERNALNODE_HXX - -#include "connectivity/dbtoolsdllapi.hxx" -#include <connectivity/sqlnode.hxx> - -namespace connectivity -{ - //========================================================================== - //= OSQLInternalNode - //========================================================================== - /** special node for avoiding memory leaks - */ - class OSQLInternalNode : public OSQLParseNode - { - public: - OSQLInternalNode(const sal_Char* pNewValue, - SQLNodeType eNodeType, - sal_uInt32 nNodeID = 0); - OSQLInternalNode(const OString& _rNewValue, - SQLNodeType eNodeType, - sal_uInt32 nNodeID = 0); - OSQLInternalNode(const OUString& _rNewValue, - SQLNodeType eNodeType, - sal_uInt32 nNodeID = 0); - - virtual ~OSQLInternalNode(); - }; -} - -#endif //_CONNECTIVITY_SQLINTERNALNODE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/parse/sqlbison_exports.hxx b/connectivity/source/inc/parse/sqlbison_exports.hxx deleted file mode 100644 index 38fa786402ea..000000000000 --- a/connectivity/source/inc/parse/sqlbison_exports.hxx +++ /dev/null @@ -1,23 +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/. - */ - -#ifndef _CONNECTIVITY_PARSE_SQLBISON_HXX_ -#define _CONNECTIVITY_PARSE_SQLBISON_HXX_ - -#include <sal/types.h> -#include <rtl/ustring.hxx> -#include <connectivity/sqlnode.hxx> - -OUString ConvertLikeToken(const ::connectivity::OSQLParseNode* pTokenNode, const ::connectivity::OSQLParseNode* pEscapeNode, sal_Bool bInternational); -int SQLyyparse (void); -void setParser( ::connectivity::OSQLParser* ); - -#endif //_CONNECTIVITY_PARSE_SQLBISON_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx deleted file mode 100644 index dd0aa463fb3b..000000000000 --- a/connectivity/source/inc/sqlscan.hxx +++ /dev/null @@ -1,83 +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 _CONNECTIVITY_SQLSCAN_HXX -#define _CONNECTIVITY_SQLSCAN_HXX - -#include <stdarg.h> -#include "connectivity/IParseContext.hxx" -#include "connectivity/dbtoolsdllapi.hxx" - -namespace connectivity -{ - //========================================================================== - //= OSQLScanner - //========================================================================== - /** Scanner for SQL92 - */ - class OOO_DLLPUBLIC_DBTOOLS OSQLScanner - { - const IParseContext* m_pContext; // context for parse, knows all international stuff - OString m_sStatement; // statement to parse - OUString m_sErrorMessage; - - sal_Int32 m_nCurrentPos; // next position to read from the statement - sal_Bool m_bInternational; // do we have a statement which may uses - sal_Int32 m_nRule; // rule to be set - - public: - OSQLScanner(); - virtual ~OSQLScanner(); - - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) - { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW(()) - { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) - { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW(()) - { } - - virtual sal_Int32 SQLyygetc(void); - virtual void SQLyyerror(char *fmt); - virtual void output(sal_Int32) { OSL_FAIL("Internal error in sdblex.l: output not possible"); } - virtual void ECHO(void) { OSL_FAIL("Internal error in sdblex.l: ECHO not possible"); } - virtual IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const; - - // setting the new information before scanning - void prepareScan(const OUString & rNewStatement, const IParseContext* pContext, sal_Bool bInternational); - const OUString& getErrorMessage() const {return m_sErrorMessage;} - OString getStatement() const { return m_sStatement; } - - sal_Int32 SQLlex(); - // set this as scanner for flex - void setScanner(sal_Bool _bNull=sal_False); - // rules settings - void SetRule(sal_Int32 nRule) {m_nRule = nRule;} - sal_Int32 GetGERRule() const; - sal_Int32 GetENGRule() const; - sal_Int32 GetSQLRule() const; - sal_Int32 GetDATERule() const; - sal_Int32 GetSTRINGRule() const; - inline sal_Int32 GetCurrentPos() const { return m_nCurrentPos; } - }; -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |