diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:07:48 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:07:48 +0200 |
commit | 0650647ed5196ab6f65875eacc99be87e6994d6f (patch) | |
tree | 0053ac989727ef4a17ddcaa86e72f4406ef5a7f4 /mysqlc/source/mysqlc_connection.hxx | |
parent | f76f752dc908cfbab1cade605fe4f742233dfa6d (diff) |
recreated tag libreoffice-3.3.1.1 which had these commits:
commit a9475f3ee585c2d8667a8823f46cb04a96da84b5 (tag: refs/tags/libreoffice-3.3.1.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Feb 8 18:07:42 2011 +0100
Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1)
commit 215bfd8724f8ebc7bdcd7c589dcd3ee2fc3cdef2
Author: Andras Timar <timar@fsf.hu>
Date: Mon Feb 7 23:18:59 2011 +0100
Added/modified NLPsolver translations from Pootle
nlpsolver/locale/NLPSolverCommon_de.properties | 2 +-
nlpsolver/locale/NLPSolverCommon_fa.properties | 14 +++---
nlpsolver/locale/NLPSolverCommon_fr.properties | 4 +-
nlpsolver/locale/NLPSolverCommon_nl.properties | 2 +-
nlpsolver/locale/NLPSolverCommon_ru.properties | 21 +++++++++
nlpsolver/locale/NLPSolverCommon_zh_TW.properties | 2 +-
.../locale/NLPSolverStatusDialog_ast.properties | 4 +-
.../locale/NLPSolverStatusDialog_de.properties | 12 +++---
.../locale/NLPSolverStatusDialog_en_GB.properties | 2 +-
.../locale/NLPSolverStatusDialog_fa.properties | 46 ++++++++++----------
.../locale/NLPSolverStatusDialog_is.properties | 27 +++++++++++
.../locale/NLPSolverStatusDialog_ru.properties | 27 +++++++++++
12 files changed, 119 insertions(+), 44 deletions(-)
commit 740c46dbb713dcc3b4a07d69ccf7ff7a634cce24
Author: Jan Holesovsky <kendy@suse.cz>
Date: Mon Feb 7 21:23:23 2011 +0100
Branch libreoffice-3-3-1
This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
commit 6e673b3b275a5008c654c4bbfb41709d30cd62af
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jan 12 10:03:30 2011 +0100
fix presenter screens description.xml build
sdext/source/presenter/makefile.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit c6d30578f94bebfe154237496eceedd338d5982b
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 23:05:56 2011 +0100
Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.
If you want to build something cool, unstable, and risky, use master.
commit d36f5922c12c793b156396d68daffb55feb3b182
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:39:06 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: extensions_libreoffice-3.3.1.1
Diffstat (limited to 'mysqlc/source/mysqlc_connection.hxx')
-rw-r--r-- | mysqlc/source/mysqlc_connection.hxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index 20f9ffac141c..ac3c4ccd79a2 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 @@ -79,7 +79,7 @@ namespace connectivity typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > my_XNameAccessRef; typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > my_XDatabaseMetaDataRef; - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XConnection, + typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XConnection, ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::lang::XServiceInfo > OMetaConnection_BASE; @@ -112,33 +112,33 @@ namespace connectivity ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_typeMap; ::com::sun::star::uno::Reference< com::sun::star::util::XStringSubstitution > m_xParameterSubstitution; protected: - + //==================================================================== // Data attributes //==================================================================== ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - OWeakRefArray m_aStatements; // vector containing a list + OWeakRefArray m_aStatements; // vector containing a list // of all the Statement objects // for this Connection - SQLWarning m_aLastWarning; // Last SQLWarning generated by an operation - OUString m_aURL; // URL of connection - OUString m_sUser; // the user name - MysqlCDriver& m_rDriver; // Pointer to the owning driver object + SQLWarning m_aLastWarning; // Last SQLWarning generated by an operation + OUString m_aURL; // URL of connection + OUString m_sUser; // the user name + MysqlCDriver& m_rDriver; // Pointer to the owning driver object sql::Driver* cppDriver; - sal_Bool m_bClosed; - sal_Bool m_bUseCatalog; // should we use the catalog on filebased databases - sal_Bool m_bUseOldDateFormat; + sal_Bool m_bClosed; + sal_Bool m_bUseCatalog; // should we use the catalog on filebased databases + sal_Bool m_bUseOldDateFormat; - void buildTypeInfo() throw(SQLException); + void buildTypeInfo() throw(SQLException); public: OUString getMysqlVariable(const char *varname) throw(SQLException, RuntimeException); - sal_Int32 getMysqlVersion() + sal_Int32 getMysqlVersion() throw(SQLException, RuntimeException); virtual void construct(const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) @@ -147,7 +147,7 @@ namespace connectivity OConnection(MysqlCDriver& _rDriver, sql::Driver * cppDriver); virtual ~OConnection(); - void closeAllStatements () throw(SQLException); + void closeAllStatements () throw(SQLException); rtl_TextEncoding getConnectionEncoding() { return m_settings.encoding; } @@ -157,7 +157,7 @@ namespace connectivity virtual void SAL_CALL disposing(void); // XInterface - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL release() throw(); // XServiceInfo DECLARE_SERVICE_INFO(); @@ -228,12 +228,12 @@ namespace connectivity //sal_Int32 sdbcColumnType(OUString typeName); inline const ConnectionSettings& getConnectionSettings() const { return m_settings; } ::rtl::OUString transFormPreparedStatement(const ::rtl::OUString& _sSQL); - + // should we use the catalog on filebased databases - inline sal_Bool isCatalogUsed() const { return m_bUseCatalog; } - inline OUString getUserName() const { return m_sUser; } - inline const MysqlCDriver& getDriver() const { return m_rDriver;} - inline rtl_TextEncoding getTextEncoding() const { return m_settings.encoding; } + inline sal_Bool isCatalogUsed() const { return m_bUseCatalog; } + inline OUString getUserName() const { return m_sUser; } + inline const MysqlCDriver& getDriver() const { return m_rDriver;} + inline rtl_TextEncoding getTextEncoding() const { return m_settings.encoding; } }; /* OConnection */ // TODO: Not used. |