diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:08:13 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:08:13 +0200 |
commit | 3bb01d6eda13bf1b4a538a24707605153fe4e37e (patch) | |
tree | 65089ad2a2c6268e4c4ffc753ae2374bd2169089 /mysqlc/source/mysqlc_statement.cxx | |
parent | 1dd3ecc26716372f4e0aeb7578acfd997f125a61 (diff) |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 8ad61991552caa3f97cc10dc468ce722f2a7217a (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:04 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit 4e3b67b32df4df0f1afe0abe0c0dc9a56829986c
Author: Andras Timar <atimar@suse.com>
Date: Sun May 29 21:38:41 2011 +0200
l10n: add br, et, and tr to NLPSolver + fixes to fr and nb
nlpsolver/locale/NLPSolverCommon_bg.properties | 22 +++++++++++++++
nlpsolver/locale/NLPSolverCommon_et.properties | 22 +++++++++++++++
nlpsolver/locale/NLPSolverCommon_nb.properties | 2 +-
nlpsolver/locale/NLPSolverCommon_tr.properties | 22 +++++++++++++++
.../locale/NLPSolverStatusDialog_bg.properties | 28 ++++++++++++++++++++
.../locale/NLPSolverStatusDialog_et.properties | 28 ++++++++++++++++++++
.../locale/NLPSolverStatusDialog_fr.properties | 4 +-
.../locale/NLPSolverStatusDialog_tr.properties | 28 ++++++++++++++++++++
8 files changed, 153 insertions(+), 3 deletions(-)
Notes
split repo tag: extensions_libreoffice-3.3.3.1
split repo tag: extensions_libreoffice-3.3.4.1
Diffstat (limited to 'mysqlc/source/mysqlc_statement.cxx')
-rw-r--r-- | mysqlc/source/mysqlc_statement.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx index 64a06e6fde34..902edc10b0d8 100644 --- a/mysqlc/source/mysqlc_statement.cxx +++ b/mysqlc/source/mysqlc_statement.cxx @@ -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 @@ -64,7 +64,7 @@ using ::rtl::OUString; #include <stdio.h> /* {{{ OConnection::OCommonStatement() -I- */ -OCommonStatement::OCommonStatement(OConnection* _pConnection, sql::Statement *_cppStatement) +OCommonStatement::OCommonStatement(OConnection* _pConnection, sql::Statement *_cppStatement) :OCommonStatement_IBase(m_aMutex) ,OPropertySetHelper(OCommonStatement_IBase::rBHelper) ,OStatement_CBase( (::cppu::OWeakObject*)_pConnection, this ) @@ -136,7 +136,7 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes() throw(RuntimeException) { OSL_TRACE("OCommonStatement::getTypes"); - ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 )); @@ -163,7 +163,7 @@ void SAL_CALL OCommonStatement::close() { OSL_TRACE("OCommonStatement::close"); /* - We need a block for the checkDisposed call. + We need a block for the checkDisposed call. After the check we can call dispose() as we are not under lock ?? */ { @@ -342,7 +342,7 @@ sal_Bool SAL_CALL OCommonStatement::getMoreResults() MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); - // if your driver supports more than only one resultset + // if your driver supports more than only one resultset // and has one more at this moment return(true return (sal_False); } @@ -384,12 +384,12 @@ void SAL_CALL OCommonStatement::clearWarnings() Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, OUString); + DECL_PROP0(CURSORNAME, OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP0(MAXFIELDSIZE,sal_Int32); - DECL_PROP0(MAXROWS, sal_Int32); + DECL_PROP0(MAXROWS, sal_Int32); DECL_PROP0(QUERYTIMEOUT,sal_Int32); DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); DECL_PROP0(RESULTSETTYPE,sal_Int32); @@ -451,7 +451,7 @@ void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const void OCommonStatement::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) const { OSL_TRACE("OCommonStatement::getFastPropertyValue"); - switch (nHandle) { + switch (nHandle) { case PROPERTY_ID_QUERYTIMEOUT: case PROPERTY_ID_MAXFIELDSIZE: case PROPERTY_ID_MAXROWS: |