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>

2 files changed, 19 insertions, 11 deletions

diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 8d1ddf95be69..7b57851c3fff 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -49,6 +49,9 @@
 class DbCellControl;
 class Edit;
 class FmXGridCell;
+namespace dbtools {
+    class FormattedColumnValue;
+}
 
 class FmMutexHelper
 {
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index fc5152a1c523..85924e4696b0 100644
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -21,8 +21,19 @@
 #define INCLUDED_SVX_SOURCE_INC_SQLPARSERCLIENT_HXX
 
 #include "svx/ParseContext.hxx"
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <connectivity/virtualdbtools.hxx>
+
+namespace com { namespace sun { namespace star {
+namespace util {
+    class XNumberFormatter;
+}
+namespace beans {
+    class XPropertySet;
+} } } }
+
+namespace connectivity {
+    class OSQLParser;
+    class OSQLParseNode;
+}
 
 namespace svxform
 {
@@ -31,26 +42,20 @@ namespace svxform
     class SVX_DLLPUBLIC OSQLParserClient : public ::svxform::OParseContextClient
     {
     private:
-
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
 
     protected:
-        mutable ::rtl::Reference< ::connectivity::simple::ISQLParser >  m_xParser;
+        mutable std::shared_ptr< ::connectivity::OSQLParser > m_pParser;
 
-    protected:
         OSQLParserClient(
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext);
 
-    protected:
-        inline ::rtl::Reference< ::connectivity::simple::ISQLParseNode > predicateTree(
+        std::shared_ptr< ::connectivity::OSQLParseNode > 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
-        {
-            return m_xParser->predicateTree(_rErrorMessage, _rStatement, _rxFormatter, _rxField);
-        }
+            ) const;
     };