summaryrefslogtreecommitdiff
path: root/svx/source/inc
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-09-08 04:57:32 +0000
committerOliver Bolte <obo@openoffice.org>2009-09-08 04:57:32 +0000
commitca00697e3dae9a03573d11281fc8d9a4ee391d3d (patch)
treec390c65f02f6f32b6d6d9faa600f4688a8c81857 /svx/source/inc
parent047473d4f1a12e867ab7154113f7f1c5422d5368 (diff)
CWS-TOOLING: integrate CWS oj18
2009-08-21 15:08:49 +0200 oj r275263 : wrong check 2009-08-21 08:56:01 +0200 oj r275215 : missing not 2009-08-20 07:27:13 +0200 oj r275164 : use new method from global 2009-08-19 10:22:35 +0200 oj r275138 : call GetLocale instead of pLocale 2009-08-18 10:39:32 +0200 oj r275082 : missing header include 2009-08-18 10:09:44 +0200 oj r275081 : new methods at global 2009-08-18 10:09:00 +0200 oj r275080 : unused var 2009-08-18 08:59:04 +0200 oj r275078 : move files from classes to xml 2009-08-17 14:58:16 +0200 oj r275056 : CWS-TOOLING: rebase CWS oj18 to trunk@275001 (milestone: DEV300:m55) 2009-08-17 13:29:44 +0200 oj r275047 : compile error 2009-08-17 13:27:47 +0200 oj r275045 : compile error 2009-08-17 11:44:54 +0200 oj r275040 : add dep 2009-07-22 14:26:05 +0200 oj r274240 : move unused services into fwl 2009-07-22 14:25:35 +0200 oj r274239 : move unused services into fwl 2009-07-22 13:47:45 +0200 oj r274233 : remove some unused code 2009-07-22 09:06:20 +0200 oj r274219 : export dbtoolsclient dbcharsethelper for sc 2009-07-22 08:48:58 +0200 oj r274218 : create NumberFormatter on demand 2009-07-22 08:39:23 +0200 oj r274217 : change char to sal_Char 2009-07-22 07:33:34 +0200 oj r274214 : export dbtoolsclient dbcharsethelper for sc 2009-07-22 07:30:04 +0200 oj r274213 : late init of numberformatter and breakiterator 2009-07-22 07:28:55 +0200 oj r274212 : export dbtoolsclient dbcharsethelper for sc 2009-07-21 13:43:28 +0200 oj r274196 : check if quick start is enbaled 2009-07-21 13:40:09 +0200 oj r274195 : check config entry for UiEventsLogger 2009-07-21 13:37:40 +0200 oj r274194 : code refactoring, remove of duplicate code and some late inits and removale of not needed files 2009-07-21 13:35:38 +0200 oj r274193 : code refactoring, remove of duplicate code and some late inits and removale of not needed files 2009-07-21 13:33:41 +0200 oj r274192 : doc meta data will now be created on demand 2009-07-21 13:13:40 +0200 oj r274187 : load ldap functions on demand 2009-07-21 13:03:17 +0200 oj r274183 : late init of TransliterationImpl 2009-07-21 12:36:10 +0200 oj r274180 : late init of charClass
Diffstat (limited to 'svx/source/inc')
-rw-r--r--svx/source/inc/dbcharsethelper.hxx69
-rw-r--r--svx/source/inc/dbtoolsclient.hxx238
-rw-r--r--svx/source/inc/fmshimp.hxx2
-rw-r--r--svx/source/inc/sqlparserclient.hxx2
-rw-r--r--svx/source/inc/tabwin.hxx2
-rw-r--r--svx/source/inc/typeconversionclient.hxx2
6 files changed, 4 insertions, 311 deletions
diff --git a/svx/source/inc/dbcharsethelper.hxx b/svx/source/inc/dbcharsethelper.hxx
deleted file mode 100644
index 6b5c1769faba..000000000000
--- a/svx/source/inc/dbcharsethelper.hxx
+++ /dev/null
@@ -1,69 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dbcharsethelper.hxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SVX_DBCHARSETHELPER_HXX
-#define SVX_DBCHARSETHELPER_HXX
-
-#include "dbtoolsclient.hxx"
-
-//........................................................................
-namespace svxform
-{
-//........................................................................
-
- //====================================================================
- //= ODataAccessCharsetHelper
- //====================================================================
- class ODataAccessCharsetHelper : public ODbtoolsClient
- {
- protected:
- mutable ::rtl::Reference< ::connectivity::simple::IDataAccessCharSet > m_xCharsetHelper;
-
- protected:
- virtual bool ensureLoaded() const;
-
- public:
- ODataAccessCharsetHelper( );
-
- inline sal_Int32 getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs ) const
- {
- if ( ensureLoaded() )
- return m_xCharsetHelper->getSupportedTextEncodings( _rEncs );
- return 0;
- }
- };
-
-//........................................................................
-} // namespace svxform
-//........................................................................
-
-#endif // SVX_DBCHARSETCLIENT_HXX
-
-
diff --git a/svx/source/inc/dbtoolsclient.hxx b/svx/source/inc/dbtoolsclient.hxx
deleted file mode 100644
index 45e0019eb67d..000000000000
--- a/svx/source/inc/dbtoolsclient.hxx
+++ /dev/null
@@ -1,238 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dbtoolsclient.hxx,v $
- * $Revision: 1.18 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SVX_DBTOOLSCLIENT_HXX
-#define SVX_DBTOOLSCLIENT_HXX
-
-#include <connectivity/virtualdbtools.hxx>
-#include <osl/mutex.hxx>
-#include <osl/module.h>
-#include <tools/solar.h>
-#include <unotools/sharedunocomponent.hxx>
-#include <svx/svxdllapi.h>
-
-//........................................................................
-namespace svxform
-{
-//........................................................................
-
- typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection;
-
- //====================================================================
- //= ODbtoolsClient
- //====================================================================
- /** base class for classes which want to use dbtools features with load-on-call
- of the dbtools lib.
- */
- class SVX_DLLPUBLIC ODbtoolsClient
- {
- private:
- static ::osl::Mutex s_aMutex;
- static sal_Int32 s_nClients;
- static oslModule s_hDbtoolsModule;
- static ::connectivity::simple::createDataAccessToolsFactoryFunction
- s_pFactoryCreationFunc;
- //add by BerryJia for fixing Bug97420 Time:2002-9-12-11:00(PRC time)
- mutable BOOL m_bCreateAlready;
-
- private:
- mutable ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory > m_xDataAccessFactory;
-
- protected:
- ODbtoolsClient();
- virtual ~ODbtoolsClient();
-
- virtual bool ensureLoaded() const;
-
- protected:
- const ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory >&
- getFactory() const { return m_xDataAccessFactory; }
-
- private:
- static void registerClient();
- static void revokeClient();
- };
-
- //====================================================================
- //= OStaticDataAccessTools
- //====================================================================
- class SVX_DLLPUBLIC OStaticDataAccessTools : public ODbtoolsClient
- {
- protected:
- mutable ::rtl::Reference< ::connectivity::simple::IDataAccessTools > m_xDataAccessTools;
-
- protected:
- virtual bool ensureLoaded() const;
-
- public:
- OStaticDataAccessTools();
-
- SVX_DLLPRIVATE const ::rtl::Reference< ::connectivity::simple::IDataAccessTools >& getDataAccessTools() const { return m_xDataAccessTools; }
-
- // ------------------------------------------------
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn,
- sal_Bool _bAllowDefault
- ) const;
-
- // ------------------------------------------------
- SVX_DLLPRIVATE sal_Int32 getDefaultNumberFormat(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xColumn,
- const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes >& _xTypes,
- const ::com::sun::star::lang::Locale& _rLocale );
-
- // ------------------------------------------------
- SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback(
- const ::rtl::OUString& _rDataSourceName,
- const ::rtl::OUString& _rUser,
- const ::rtl::OUString& _rPwd,
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory
- ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) );
-
- // ------------------------------------------------
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> connectRowset(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet,
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory,
- sal_Bool _bSetAsActiveConnection
- ) const SAL_THROW ( ( ::com::sun::star::sdbc::SQLException
- , ::com::sun::star::lang::WrappedTargetException
- , ::com::sun::star::uno::RuntimeException) );
-
- // ------------------------------------------------
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getRowSetConnection(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet)
- const SAL_THROW ( (::com::sun::star::uno::RuntimeException) );
-
- // ------------------------------------------------
- SVX_DLLPRIVATE void TransferFormComponentProperties(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxOld,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxNew,
- const ::com::sun::star::lang::Locale& _rLocale
- ) const;
-
- // ------------------------------------------------
- SVX_DLLPRIVATE ::rtl::OUString quoteName(
- const ::rtl::OUString& _rQuote,
- const ::rtl::OUString& _rName
- ) const;
-
- // ------------------------------------------------
- SVX_DLLPRIVATE ::rtl::OUString composeTableNameForSelect(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable
- ) const;
-
- // ------------------------------------------------
- SVX_DLLPRIVATE ::com::sun::star::sdb::SQLContext prependContextInfo(
- ::com::sun::star::sdbc::SQLException& _rException,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
- const ::rtl::OUString& _rContextDescription,
- const ::rtl::OUString& _rContextDetails
- ) const;
-
- // ------------------------------------------------
- SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource(
- const ::rtl::OUString& _rsRegisteredName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory
- ) const;
-
- // ------------------------------------------------
- /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT
- @param _rxCursorSet the property set
- */
- SVX_DLLPRIVATE sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
-
- // ------------------------------------------------
- /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE
- @param _rxCursorSet the property set
- */
- SVX_DLLPRIVATE sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
-
- // ------------------------------------------------
- /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::DELETE
- @param _rxCursorSet the property set
- */
- SVX_DLLPRIVATE sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
-
- // ------------------------------------------------
- SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
- getFieldsByCommandDescriptor(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
- const sal_Int32 _nCommandType,
- const ::rtl::OUString& _rCommand,
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive,
- ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
- ) SAL_THROW( ( ) );
-
- // ------------------------------------------------
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
- getFieldNamesByCommandDescriptor(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
- const sal_Int32 _nCommandType,
- const ::rtl::OUString& _rCommand,
- ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
- ) SAL_THROW( ( ) );
-
- // ------------------------------------------------
- SVX_DLLPRIVATE bool isEmbeddedInDatabase(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent,
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxActualConnection
- );
-
- // ------------------------------------------------
- SVX_DLLPRIVATE bool isEmbeddedInDatabase(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent
- );
- };
-
- //====================================================================
- //= DBToolsObjectFactory
- //====================================================================
- class DBToolsObjectFactory : public ODbtoolsClient
- {
- public:
- DBToolsObjectFactory();
- ~DBToolsObjectFactory();
-
- // ------------------------------------------------
- ::std::auto_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue(
- const ::comphelper::ComponentContext& _rContext,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn
- );
- };
-
-//........................................................................
-} // namespace svxform
-//........................................................................
-
-#endif // SVX_DBTOOLSCLIENT_HXX
-
-
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 438aee48d969..85644ea5daba 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -79,7 +79,7 @@
#include <cppuhelper/compbase4.hxx>
#include <cppuhelper/compbase6.hxx>
#include <unotools/configitem.hxx>
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
#include "formcontrolling.hxx"
#include "fmdocumentclassification.hxx"
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index f60af20e05fd..65f96cf80523 100644
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -31,7 +31,7 @@
#ifndef SVX_SQLPARSERCLIENT_HXX
#define SVX_SQLPARSERCLIENT_HXX
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
#include "ParseContext.hxx"
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index e83e0c0f80bd..be46c05a58d5 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -42,7 +42,7 @@
//#endif
#include <comphelper/propmultiplex.hxx>
#include <svtools/transfer.hxx>
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
//==================================================================
class FmFieldWin;
diff --git a/svx/source/inc/typeconversionclient.hxx b/svx/source/inc/typeconversionclient.hxx
index 947cc4eddd07..2cfaaabe5173 100644
--- a/svx/source/inc/typeconversionclient.hxx
+++ b/svx/source/inc/typeconversionclient.hxx
@@ -31,7 +31,7 @@
#ifndef SVX_TYPECONVERSION_CLIENT_HXX
#define SVX_TYPECONVERSION_CLIENT_HXX
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
//........................................................................
namespace svxform