summaryrefslogtreecommitdiff
path: root/include/svx
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 /include/svx
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 'include/svx')
-rw-r--r--include/svx/dbcharsethelper.hxx29
1 files changed, 9 insertions, 20 deletions
diff --git a/include/svx/dbcharsethelper.hxx b/include/svx/dbcharsethelper.hxx
index ad02bd90a37c..395d33dfcb16 100644
--- a/include/svx/dbcharsethelper.hxx
+++ b/include/svx/dbcharsethelper.hxx
@@ -21,30 +21,19 @@
#define INCLUDED_SVX_DBCHARSETHELPER_HXX
#include <svx/svxdllapi.h>
-#include <connectivity/virtualdbtools.hxx>
+#include <rtl/textenc.h>
-namespace svxform
-{
-
-
-
- //= ODataAccessCharsetHelper
+#include <vector>
- class SVX_DLLPUBLIC SAL_WARN_UNUSED ODataAccessCharsetHelper
- {
- protected:
- mutable ::rtl::Reference< ::connectivity::simple::IDataAccessCharSet > m_xCharsetHelper;
-
- public:
- ODataAccessCharsetHelper( );
-
- inline sal_Int32 getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs ) const
- {
- return m_xCharsetHelper->getSupportedTextEncodings( _rEncs );
- }
- };
+namespace svxform { namespace charset_helper
+{
+ /** enumerates all supported charsets
+ @return the number of charsets supported
+ */
+ SVX_DLLPUBLIC sal_Int32 getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs );
+} // namespace charset_helper
} // namespace svxform