[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - connectivity/source
connectivity/source/drivers/firebird/ResultSetMetaData.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit cd961ccaadbe0e14512421ce91134dd7c601e7cf
Author: Wastack <btom...@gmail.com>
Date: Thu Dec 15 12:19:59 2016 +0100
tdf#70506 implement getColumnLabel function
which is responsible for aliasnames defined with the SQL 'AS' keyword.
Change-Id: I6aaf1ba6969e2bd738941e41492338382168bc89
Reviewed-on: https://gerrit.libreoffice.org/32042
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
(cherry picked from commit ef1aee0f80d34b75b0d406abc708a0e8316fe5e8)
Reviewed-on: https://gerrit.libreoffice.org/32250
diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
index 6b6d984..7d2dd2f 100644
--- a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
@@ -128,8 +128,13 @@ OUString SAL_CALL
OResultSetMetaData::getColumnTypeName(sal_Int32 column)
OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
-// TODO: clarify what this is -- probably not the alias
-return getColumnName(column);
+// aliasname
+verifyValidColumn(column);
+OUString sRet(m_pSqlda->sqlvar[column-1].aliasname,
+m_pSqlda->sqlvar[column-1].aliasname_length,
+RTL_TEXTENCODING_UTF8);
+sanitizeIdentifier(sRet);
+return sRet;
}
OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/ResultSetMetaData.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit ef1aee0f80d34b75b0d406abc708a0e8316fe5e8
Author: Wastack <btom...@gmail.com>
Date: Thu Dec 15 12:19:59 2016 +0100
tdf#70506 implement getColumnLabel function
which is responsible for aliasnames defined with the SQL 'AS' keyword.
Change-Id: I6aaf1ba6969e2bd738941e41492338382168bc89
Reviewed-on: https://gerrit.libreoffice.org/32042
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
index 6b6d984..7d2dd2f 100644
--- a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
@@ -128,8 +128,13 @@ OUString SAL_CALL
OResultSetMetaData::getColumnTypeName(sal_Int32 column)
OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
-// TODO: clarify what this is -- probably not the alias
-return getColumnName(column);
+// aliasname
+verifyValidColumn(column);
+OUString sRet(m_pSqlda->sqlvar[column-1].aliasname,
+m_pSqlda->sqlvar[column-1].aliasname_length,
+RTL_TEXTENCODING_UTF8);
+sanitizeIdentifier(sRet);
+return sRet;
}
OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 13 +
connectivity/source/drivers/firebird/PreparedStatement.cxx |5 ++---
connectivity/source/drivers/firebird/ResultSet.cxx |5 +++--
connectivity/source/drivers/firebird/Util.cxx | 10 ++
4 files changed, 28 insertions(+), 5 deletions(-)
New commits:
commit 1d0f3649ba271a439ab38d35ce02462561cc9caa
Author: Wastack <btom...@gmail.com>
Date: Sun Nov 27 15:08:18 2016 +0100
tdf#103074 Implement Boolean Type for FB driver
Change-Id: Ibed5435e23730dc901155e79152e9becd3e70566
Reviewed-on: https://gerrit.libreoffice.org/31262
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 959b134..1240fae 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -1050,6 +1050,19 @@ uno::Reference< XResultSet > SAL_CALL
ODatabaseMetaData::getTypeInfo()
aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
aResults.push_back(aRow);
+// SQL_BOOLEAN
+// TODO FIXME precision
+aRow[1] = new ORowSetValueDecorator(OUString("BOOLEAN"));
+aRow[2] = new
ORowSetValueDecorator(getColumnTypeFromFBType(SQL_BOOLEAN, 0));
+aRow[3] = new ORowSetValueDecorator(sal_Int32(1)); // Prevision = max
length
+aRow[6] = new ORowSetValueDecorator(); // Create Params
+aRow[9] = new ORowSetValueDecorator(
+sal_Int16(ColumnSearch::BASIC)); // Searchable
+aRow[12] = new ORowSetValueDecorator(false); // Autoincrement
+aRow[14] = ODatabaseMetaDataResultSet::get0Value(); // Minimum scale
+aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
+aResults.push_back(aRow);
+
// TODO: complete
// case SQL_ARRAY:
// case SQL_NULL:
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 7af0976..7af5203 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -355,11 +355,10 @@ void SAL_CALL OPreparedStatement::setNull(sal_Int32
nIndex, sal_Int32 /*nSqlType
setParameterNull(nIndex);
}
-void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 /*nIndex*/, sal_Bool
/*bValue*/)
+void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 nIndex, sal_Bool bValue)
throw(SQLException, RuntimeException, std::exception)
{
-// FIREBIRD3: will need to be implemented.
-
::dbtools::throwFunctionNotSupportedSQLException("XParameters::setBoolean",
*this);
+setValue< sal_Bool >(nIndex, bValue, SQL_BOOLEAN);
}
template
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx
b/connectivity/source/drivers/firebird/ResultSet.cxx
index e1007af..b09d6cc 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -481,6 +481,8 @@ ORowSetValue OResultSet::retrieveValue(const sal_Int32
nColumnIndex, const ISC_S
if(nSqlSubType == 1 || nSqlSubType == 2) //numeric or decimal
return getString(nColumnIndex);
return getLong(nColumnIndex);
+case SQL_BOOLEAN:
+return getBoolean(nColumnIndex);
case SQL_BLOB:
case SQL_NULL:
case SQL_QUAD:
@@ -643,8 +645,7 @@ sal_Bool SAL_CALL OResultSet::wasNull() throw(SQLException,
RuntimeException, st
sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 nColumnIndex)
throw(SQLException, RuntimeException, std::exception)
{
-// Not a native firebird type hence we always have to convert.
-return safelyRetrieveValue< ORowSetValue >(nColumnIndex);
+return safelyRetrieveValue< sal_Bool >(nColumnIndex, SQL_BOOLEAN);
}
sal_Int8 SAL_CALL OResultSet::getByte(sal_Int32 nColumnIndex)
diff --git a/connectivity/source/drivers/firebird/Util.cxx
b/connectivity/source/drivers/firebird/Util.cxx
index 1502e60..7d72900 100644
--- a/connectivity/source/drivers/firebird/Util.cxx
+++ b/connectivity/source/drivers/firebird/Util.cxx
@@ -127,6 +127,8 @@ sal_Int32 firebird::getColumnTypeFromFBType(short aType,
short aSubType)
return DataType::SQLNULL;
case SQL_QUAD: // Is a "Blob ID" according to the docs
return 0; // TODO: verify
+case SQL_BOOLEAN:
+return DataType::BOOLEAN;
default:
assert(false); // Should never happen
return 0;
@@ -185,6 +187,8 @@ OUString firebird::getColumnTypeNameFromFBType(short aType,
short aSubType)
return OUString("SQL_NULL");
case SQL_QUAD:
return
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/DatabaseMetaData.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit ea61a62323fe398d682da5bbf5b0d9e17d442212
Author: Wastack <btom...@gmail.com>
Date: Tue Nov 29 10:10:30 2016 +0100
tdf#104227 query boolean like infos correctly
Change-Id: Ic862bb1ce3efa61d6a01fc56fb9e84cf98bb7cd0
Reviewed-on: https://gerrit.libreoffice.org/31355
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Tested-by: Lionel Elie Mamane <lio...@mamane.lu>
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 4c2e393..959b134 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -1124,7 +1124,8 @@ uno::Reference< XResultSet > SAL_CALL
ODatabaseMetaData::getColumnPrivileges(
aCurrentRow[5] = new ORowSetValueDecorator(xRow->getString(2)); // 5.
GRANTOR
aCurrentRow[6] = new ORowSetValueDecorator(xRow->getString(3)); // 6.
GRANTEE
aCurrentRow[7] = new ORowSetValueDecorator(xRow->getString(4)); // 7.
Privilege
-aCurrentRow[7] = new ORowSetValueDecorator(xRow->getBoolean(5)); // 8.
Grantable
+aCurrentRow[7] = new ORowSetValueDecorator( ( xRow->getShort(5) == 1 )
?
+OUString("YES") : OUString("NO")); // 8. Grantable
aResults.push_back(aCurrentRow);
}
@@ -1721,7 +1722,7 @@ uno::Reference< XResultSet > SAL_CALL
ODatabaseMetaData::getIndexInfo(
}
// 4. NON_UNIQUE -- i.e. specifically negate here.
-aCurrentRow[4] = new ORowSetValueDecorator(!xRow->getBoolean(5));
+aCurrentRow[4] = new ORowSetValueDecorator(xRow->getShort(5) == 0);
// 6. INDEX NAME
aCurrentRow[6] = new
ORowSetValueDecorator(sanitizeIdentifier(xRow->getString(4)));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/PreparedStatement.cxx | 13
connectivity/source/drivers/firebird/PreparedStatement.hxx |1
connectivity/source/drivers/firebird/ResultSet.cxx |7
connectivity/source/drivers/firebird/ResultSet.hxx |6
connectivity/source/drivers/firebird/ResultSetMetaData.cxx |8
connectivity/source/drivers/firebird/ResultSetMetaData.hxx |5
connectivity/source/drivers/firebird/Statement.cxx |9
connectivity/source/drivers/firebird/Util.cxx | 218 -
connectivity/source/drivers/firebird/Util.hxx |4
9 files changed, 12 insertions(+), 259 deletions(-)
New commits:
commit 3ec084d61e9c8aa0199b52de43fe288001f47e6d
Author: Wastack <btom...@gmail.com>
Date: Thu Nov 17 14:00:06 2016 +0100
get table name from resultset simply
There is a much simpler way to access table name in ResultSetMetadata
in Firebird sdbc which I didn't notice before.
Change-Id: Ib306c04acf38ec86475d8d1a22a67012fe48539e
Reviewed-on: https://gerrit.libreoffice.org/30931
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Tested-by: Lionel Elie Mamane <lio...@mamane.lu>
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 35da8ff..7af0976 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -57,7 +57,6 @@ OPreparedStatement::OPreparedStatement( Connection*
_pConnection,
,m_sSqlStatement(sql)
,m_pOutSqlda(nullptr)
,m_pInSqlda(nullptr)
-,m_sTableName()
{
SAL_INFO("connectivity.firebird", "OPreparedStatement(). "
"sql: " << sql);
@@ -85,12 +84,6 @@ void OPreparedStatement::ensurePrepared()
m_pOutSqlda,
m_pInSqlda);
-OStringVector vec;
-tokenizeSQL( OUStringToOString(m_sSqlStatement, RTL_TEXTENCODING_UTF8),
vec );
-m_sTableName =
-OStringToOUString(
-extractSingleTableFromSelect( vec ), RTL_TEXTENCODING_UTF8);
-
aErr = isc_dsql_describe_bind(m_statusVector,
_aStatementHandle,
1,
@@ -159,8 +152,7 @@ Reference< XResultSetMetaData > SAL_CALL
OPreparedStatement::getMetaData()
if(!m_xMetaData.is())
m_xMetaData = new OResultSetMetaData(m_pConnection.get()
- , m_pOutSqlda
- , m_sTableName);
+ , m_pOutSqlda);
return m_xMetaData;
}
@@ -294,8 +286,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute()
m_aMutex,
uno::Reference< XInterface >(*this),
m_aStatementHandle,
- m_pOutSqlda,
- m_sTableName);
+ m_pOutSqlda);
if (getStatementChangeCount() > 0)
m_pConnection->notifyDatabaseModified();
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx
b/connectivity/source/drivers/firebird/PreparedStatement.hxx
index d98e46d..21f1d3b 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.hxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx
@@ -53,7 +53,6 @@ namespace connectivity
XSQLDA* m_pOutSqlda;
XSQLDA* m_pInSqlda;
-::rtl::OUString m_sTableName;
void checkParameterIndex(sal_Int32 nParameterIndex)
throw(css::sdbc::SQLException,
css::uno::RuntimeException);
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx
b/connectivity/source/drivers/firebird/ResultSet.cxx
index 4449d5e..f480465 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -57,8 +57,7 @@ OResultSet::OResultSet(Connection* pConnection,
::osl::Mutex& rMutex,
const uno::Reference< XInterface >& xStatement,
isc_stmt_handle& aStatementHandle,
- XSQLDA* pSqlda,
- const OUString& rTableName)
+ XSQLDA* pSqlda )
: OResultSet_BASE(rMutex)
, OPropertyContainer(OResultSet_BASE::rBHelper)
, m_bIsBookmarkable(false)
@@ -76,7 +75,6 @@ OResultSet::OResultSet(Connection* pConnection,
, m_currentRow(0)
, m_bIsAfterLastRow(false)
, m_fieldCount(pSqlda? pSqlda->sqld : 0)
-, m_sTableName(rTableName)
{
SAL_INFO("connectivity.firebird", "OResultSet()."
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/PreparedStatement.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit a2686cc717187637c47f9c748b115a46bf16eced
Author: Wastack <btom...@gmail.com>
Date: Thu Nov 17 14:41:35 2016 +0100
tdf#74172 ensure prepared while setting numeric
Change-Id: I727a0af5c3aa1b2e1f6c251b2dcb32feb46041d6
Reviewed-on: https://gerrit.libreoffice.org/30933
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 2885193..35da8ff 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -599,6 +599,10 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(
sal_Int32 parameterIndex, c
{
checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
::osl::MutexGuard aGuard( m_aMutex );
+ensurePrepared();
+
+checkParameterIndex(parameterIndex);
+setParameterNull(parameterIndex, false);
XSQLVAR* pVar = m_pInSqlda->sqlvar + (parameterIndex - 1);
int dType = (pVar->sqltype & ~1); // drop null flag
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/Column.cxx|1
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 74 ++---
connectivity/source/drivers/firebird/PreparedStatement.cxx | 103 -
connectivity/source/drivers/firebird/PreparedStatement.hxx |7
connectivity/source/drivers/firebird/ResultSet.cxx | 82 ++
connectivity/source/drivers/firebird/ResultSet.hxx |3
connectivity/source/drivers/firebird/ResultSetMetaData.cxx | 42 -
connectivity/source/drivers/firebird/Util.cxx | 46 +
connectivity/source/drivers/firebird/Util.hxx |5
9 files changed, 324 insertions(+), 39 deletions(-)
New commits:
commit 21cc1826c758bb71bb0cfa055b3bb51a38bc2acb
Author: Wastack <btom...@gmail.com>
Date: Mon Oct 31 16:32:54 2016 +0100
WiP tdf#74172 use DECIMAL and NUMERIC data types
Change-Id: I917cdf6e8d3ebfa7c9e4a52ca61adc5b8707ecfc
Reviewed-on: https://gerrit.libreoffice.org/30447
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
diff --git a/connectivity/source/drivers/firebird/Column.cxx
b/connectivity/source/drivers/firebird/Column.cxx
index 28ce9ac..38c367c 100644
--- a/connectivity/source/drivers/firebird/Column.cxx
+++ b/connectivity/source/drivers/firebird/Column.cxx
@@ -24,6 +24,7 @@ Column::Column()
void Column::construct()
{
+OColumn::construct();
m_sAutoIncrement = "GENERATED BY DEFAULT AS IDENTITY";
registerProperty(OMetaConnection::getPropMap().getNameByIndex(
PROPERTY_ID_AUTOINCREMENTCREATION),
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index f5b1a7e..bb26401 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
using namespace connectivity::firebird;
using namespace com::sun::star;
@@ -902,7 +903,7 @@ uno::Reference< XResultSet > SAL_CALL
ODatabaseMetaData::getTypeInfo()
// SQL_TEXT
aRow[1] = new ORowSetValueDecorator(OUString("CHAR"));
-aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TEXT));
+aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TEXT,
0));
aRow[3] = new ORowSetValueDecorator(sal_Int16(32767)); // Prevision =
max length
aRow[6] = new ORowSetValueDecorator(OUString("length")); // Create
Params
aRow[9] = new ORowSetValueDecorator(
@@ -914,7 +915,7 @@ uno::Reference< XResultSet > SAL_CALL
ODatabaseMetaData::getTypeInfo()
// SQL_VARYING
aRow[1] = new ORowSetValueDecorator(OUString("VARCHAR"));
-aRow[2] = new
ORowSetValueDecorator(getColumnTypeFromFBType(SQL_VARYING));
+aRow[2] = new
ORowSetValueDecorator(getColumnTypeFromFBType(SQL_VARYING, 0));
aRow[3] = new ORowSetValueDecorator(sal_Int16(32767)); // Prevision =
max length
aRow[6] = new ORowSetValueDecorator(OUString("length")); // Create
Params
aRow[9] = new ORowSetValueDecorator(
@@ -935,44 +936,62 @@ uno::Reference< XResultSet > SAL_CALL
ODatabaseMetaData::getTypeInfo()
}
// SQL_SHORT
aRow[1] = new ORowSetValueDecorator(OUString("SMALLINT"));
-aRow[2] = new
ORowSetValueDecorator(getColumnTypeFromFBType(SQL_SHORT));
+aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_SHORT,
0));
aRow[3] = new ORowSetValueDecorator(sal_Int16(5)); // Prevision
aResults.push_back(aRow);
// SQL_LONG
aRow[1] = new ORowSetValueDecorator(OUString("INTEGER"));
-aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_LONG));
+aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_LONG,
0));
aRow[3] = new ORowSetValueDecorator(sal_Int16(10)); // Precision
aResults.push_back(aRow);
// SQL_INT64
aRow[1] = new ORowSetValueDecorator(OUString("BIGINT"));
-aRow[2] = new
ORowSetValueDecorator(getColumnTypeFromFBType(SQL_INT64));
+aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_INT64,
0));
aRow[3] = new ORowSetValueDecorator(sal_Int16(20)); // Precision
aResults.push_back(aRow);
// Decimal Types common
{
-aRow[6] = new ORowSetValueDecorator(); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable
aRow[12] = new ORowSetValueDecorator(true); // Autoincrement
}
+
+aRow[6] = new ORowSetValueDecorator(OUString("PRECISION,SCALE")); //
Create params
+// NUMERIC
+
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/Connection.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 41832d27c3325808333c21b9181db84ae9788978
Author: Wastack <btom...@gmail.com>
Date: Sat Oct 22 15:28:59 2016 +0200
tdf#103373 create and connect with default user
For an embedded Firebird database resolve authentification with a
default username and password (hardcoded) instead of trusted
authentification.
Change-Id: I54ee04898a8b2bedc9a24001c64173400769f416
Reviewed-on: https://gerrit.libreoffice.org/30160
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
diff --git a/connectivity/source/drivers/firebird/Connection.cxx
b/connectivity/source/drivers/firebird/Connection.cxx
index 17528d7..48ebba5 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -258,9 +258,8 @@ void Connection::construct(const ::rtl::OUString& url,
const Sequence< PropertyV
if (m_bIsEmbedded || m_bIsFile)
{
-*dpb++ = isc_dpb_trusted_auth;
-*dpb++ = 1; // Length of data
-*dpb++ = 1; // TRUE
+strcpy(userName,"sysdba");
+strcpy(userPassword,"masterkey");
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source external/firebird
connectivity/source/drivers/firebird/Connection.cxx | 304
connectivity/source/drivers/firebird/Connection.hxx | 37 ++
external/firebird/ExternalPackage_firebird.mk |1
3 files changed, 228 insertions(+), 114 deletions(-)
New commits:
commit 0cc1ddf2d8d6bc7df74fdd8f8f97381df681177d
Author: Wastack <btom...@gmail.com>
Date: Thu Aug 11 12:02:56 2016 +0200
tdf#72987 GSoC Use Firebird backup format
Store embedded database files as an archive (.fbk) file.
The firebird database file is extracted when opening an
odb file, and archived for each saving.
Change-Id: I6c985f89a0fb01b2294f728b4581053521ca0c88
Reviewed-on: https://gerrit.libreoffice.org/28045
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/connectivity/source/drivers/firebird/Connection.cxx
b/connectivity/source/drivers/firebird/Connection.cxx
index ad843c4..1218785 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -58,6 +58,13 @@
#include
#include
+#include
+
+#ifdef _WIN32
+// for ADD_SPB_NUMERIC
+#pragma warning(disable: 4310) // cast truncates data
+#endif
+
using namespace connectivity::firebird;
using namespace connectivity;
@@ -79,7 +86,11 @@ using namespace ::com::sun::star::uno;
* Location within the .odb that an embedded .fdb will be stored.
* Only relevant for embedded dbs.
*/
-static const OUStringLiteral our_sDBLocation( "firebird.fdb" );
+static const OUStringLiteral our_sFDBLocation( "firebird.fdb" );
+/**
+ * Older version of LO may store the database in a .fdb file
+ */
+static const OUStringLiteral our_sFBKLocation( "firebird.fbk" );
Connection::Connection(FirebirdDriver*_pDriver)
: Connection_BASE(m_aMutex)
@@ -141,6 +152,9 @@ void Connection::construct(const ::rtl::OUString& url,
const Sequence< PropertyV
m_sConnectionURL = url;
bool bIsNewDatabase = false;
+// the database may be stored as an
+// fdb file in older versions
+bool bIsFdbStored = false;
OUString aStorageURL;
if (url == "sdbc:embedded:firebird")
{
@@ -174,35 +188,36 @@ void Connection::construct(const ::rtl::OUString& url,
const Sequence< PropertyV
bIsNewDatabase = !m_xEmbeddedStorage->hasElements();
-m_pExtractedFDBFile.reset(new ::utl::TempFile(nullptr, true));
-m_sFirebirdURL = m_pExtractedFDBFile->GetFileName() +
"/firebird.fdb";
+m_pDatabaseFileDir.reset(new ::utl::TempFile(nullptr, true));
+m_pDatabaseFileDir->EnableKillingFile();
+m_sFirebirdURL = m_pDatabaseFileDir->GetFileName() +
"/firebird.fdb";
+m_sFBKPath = m_pDatabaseFileDir->GetFileName() + "/firebird.fbk";
SAL_INFO("connectivity.firebird", "Temporary .fdb location: " <<
m_sFirebirdURL);
if (!bIsNewDatabase)
{
-SAL_INFO("connectivity.firebird", "Extracting .fdb from .odb"
);
-if (!m_xEmbeddedStorage->isStreamElement(our_sDBLocation))
+if (m_xEmbeddedStorage->hasByName(our_sFBKLocation) &&
+m_xEmbeddedStorage->isStreamElement(our_sFBKLocation))
{
-::connectivity::SharedResources aResources;
-const OUString sMessage =
aResources.getResourceString(STR_ERROR_NEW_VERSION);
-::dbtools::throwGenericSQLException(sMessage ,*this);
+SAL_INFO("connectivity.firebird", "Extracting* .fbk from
.odb" );
+loadDatabaseFile(our_sFBKLocation, m_sFBKPath);
}
-
-Reference< XStream >
xDBStream(m_xEmbeddedStorage->openStreamElement(our_sDBLocation,
-
ElementModes::READ));
-
-uno::Reference< ucb::XSimpleFileAccess2 > xFileAccess(
-ucb::SimpleFileAccess::create(
comphelper::getProcessComponentContext() ),
-
uno::UNO_QUERY );
-if ( !xFileAccess.is() )
+else if(m_xEmbeddedStorage->hasByName(our_sFDBLocation) &&
+m_xEmbeddedStorage->isStreamElement(our_sFDBLocation))
+{
+SAL_INFO("connectivity.firebird", "Found .fdb instead of
.fbk");
+bIsFdbStored = true;
+loadDatabaseFile(our_sFDBLocation, m_sFirebirdURL);
+}
+else
{
::connectivit
[Libreoffice-commits] core.git: connectivity/Library_firebird_sdbc.mk connectivity/source
connectivity/Library_firebird_sdbc.mk |1
connectivity/source/drivers/firebird/Column.cxx| 54 +++
connectivity/source/drivers/firebird/Column.hxx| 37 ++
connectivity/source/drivers/firebird/Columns.cxx |6
connectivity/source/drivers/firebird/Columns.hxx |3
connectivity/source/drivers/firebird/PreparedStatement.cxx | 13
connectivity/source/drivers/firebird/PreparedStatement.hxx |1
connectivity/source/drivers/firebird/ResultSet.cxx |8
connectivity/source/drivers/firebird/ResultSet.hxx |5
connectivity/source/drivers/firebird/ResultSetMetaData.cxx | 37 +-
connectivity/source/drivers/firebird/ResultSetMetaData.hxx |5
connectivity/source/drivers/firebird/Statement.cxx |9
connectivity/source/drivers/firebird/Table.cxx |6
connectivity/source/drivers/firebird/Tables.cxx| 93 +
connectivity/source/drivers/firebird/Tables.hxx|2
connectivity/source/drivers/firebird/Util.cxx | 234 +
connectivity/source/drivers/firebird/Util.hxx | 11
17 files changed, 511 insertions(+), 14 deletions(-)
New commits:
commit 0a9123152387f7a742481e9f35401270e29ed695
Author: Wastack <btom...@gmail.com>
Date: Thu Aug 11 20:03:18 2016 +0200
tdf#69949 GSoC Firebird implement autoincrement
Change-Id: I6fe08b575f01b986f0a3c96b341f254279427b68
Reviewed-on: https://gerrit.libreoffice.org/28062
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/connectivity/Library_firebird_sdbc.mk
b/connectivity/Library_firebird_sdbc.mk
index 4c3dae1..43fa363 100644
--- a/connectivity/Library_firebird_sdbc.mk
+++ b/connectivity/Library_firebird_sdbc.mk
@@ -42,6 +42,7 @@ $(eval $(call
gb_Library_set_componentfile,firebird_sdbc,connectivity/source/dri
$(eval $(call gb_Library_add_exception_objects,firebird_sdbc,\
connectivity/source/drivers/firebird/Blob \
connectivity/source/drivers/firebird/Catalog \
+connectivity/source/drivers/firebird/Column \
connectivity/source/drivers/firebird/Columns \
connectivity/source/drivers/firebird/Connection \
connectivity/source/drivers/firebird/DatabaseMetaData \
diff --git a/connectivity/source/drivers/firebird/Column.cxx
b/connectivity/source/drivers/firebird/Column.cxx
new file mode 100644
index 000..28ce9ac
--- /dev/null
+++ b/connectivity/source/drivers/firebird/Column.cxx
@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "Columns.hxx"
+#include "Column.hxx"
+
+#include "TConnection.hxx"
+
+using namespace connectivity;
+using namespace connectivity::firebird;
+using namespace connectivity::sdbcx;
+
+Column::Column()
+: OColumn( true ) // case sensitive
+{
+construct();
+}
+
+void Column::construct()
+{
+m_sAutoIncrement = "GENERATED BY DEFAULT AS IDENTITY";
+registerProperty(OMetaConnection::getPropMap().getNameByIndex(
+PROPERTY_ID_AUTOINCREMENTCREATION),
+ PROPERTY_ID_AUTOINCREMENTCREATION,
+ 0,
+ _sAutoIncrement,
+ cppu::UnoType<decltype(m_sAutoIncrement)>::get()
+ );
+}
+
+::cppu::IPropertyArrayHelper* Column::createArrayHelper( sal_Int32 /*_nId*/ )
const
+{
+return doCreateArrayHelper();
+}
+
+::cppu::IPropertyArrayHelper & SAL_CALL Column::getInfoHelper()
+{
+return *Column_PROP::getArrayHelper(isNew() ? 1 : 0);
+}
+
+css::uno::Sequence< OUString > SAL_CALL Column::getSupportedServiceNames( )
throw(css::uno::RuntimeException, std::exception)
+{
+css::uno::Sequence< OUString > aSupported { "com.sun.star.sdbc.Firebird" };
+
+return aSupported;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/Column.hxx
b/connectivity/source/drivers/firebird/Column.hxx
new file mode 100644
index 000..0b1ea67
--- /dev/null
+++ b/connectivity/source/drivers/firebird/Column.hxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_HCOLUMN_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_DRIV
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/PreparedStatement.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 3828e10f7c3918f89312228739b428dc5046b52e
Author: Wastack <btom...@gmail.com>
Date: Tue Aug 16 19:25:25 2016 +0200
tdf#91324 correct firebird date format
Store date inside the embedded firebird database as:
Years as the years since 1900.
Months from 0 to 11.
Change-Id: Ic6269a183261c4c482f91f0d3871b42c54d4b99f
Reviewed-on: https://gerrit.libreoffice.org/28173
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Tested-by: Lionel Elie Mamane <lio...@mamane.lu>
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 007714d..801acd8 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -391,8 +391,8 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 nIndex,
const Date& rDate)
{
struct tm aCTime;
aCTime.tm_mday = rDate.Day;
-aCTime.tm_mon = rDate.Month;
-aCTime.tm_year = rDate.Year;
+aCTime.tm_mon = rDate.Month -1;
+aCTime.tm_year = rDate.Year -1900;
ISC_DATE aISCDate;
isc_encode_sql_date(, );
@@ -422,8 +422,8 @@ void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32
nIndex, const DateTime&
aCTime.tm_min = rTimestamp.Minutes;
aCTime.tm_hour = rTimestamp.Hours;
aCTime.tm_mday = rTimestamp.Day;
-aCTime.tm_mon = rTimestamp.Month;
-aCTime.tm_year = rTimestamp.Year;
+aCTime.tm_mon = rTimestamp.Month - 1;
+aCTime.tm_year = rTimestamp.Year - 1900;
ISC_TIMESTAMP aISCTimestamp;
isc_encode_timestamp(, );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/Driver.cxx |4 1 file changed, 4 insertions(+) New commits: commit d3a510e6ec7a42a7a30a24b7373931b8a8ef1a54 Author: Wastack <btom...@gmail.com> Date: Thu Aug 11 13:13:57 2016 +0200 tdf#73073 GSoC Firebird Set autoCommit true Use autoCommit for embedded Firebird database. Change-Id: I5633960b8e3d4e6ee8f9b4f29406c7208a059521 Reviewed-on: https://gerrit.libreoffice.org/28047 Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu> Tested-by: Lionel Elie Mamane <lio...@mamane.lu> diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index a3224e5..ff63fbe 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -192,6 +192,10 @@ Reference< XConnection > SAL_CALL FirebirdDriver::connect( Connection* pCon = new Connection(this); Reference< XConnection > xCon = pCon; pCon->construct(url, info); + +if (url == "sdbc:embedded:firebird") +pCon->setAutoCommit(true); + m_xConnections.push_back(WeakReferenceHelper(*pCon)); return xCon; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac connectivity/source download.lst external/firebird external/libtommath external/Module_external.mk Makefile.fetch RepositoryExternal.mk
Makefile.fetch |1
RepositoryExternal.mk| 49
configure.ac | 29
connectivity/source/drivers/firebird/Driver.cxx | 19
download.lst |4
external/Module_external.mk |1
external/firebird/ExternalPackage_firebird.mk| 11
external/firebird/ExternalProject_firebird.mk| 45
external/firebird/UnpackedTarball_firebird.mk| 11
external/firebird/firebird-Engine12.patch| 16
external/firebird/firebird-c++11.patch.1 | 27
external/firebird/firebird-c++14.patch | 30
external/firebird/firebird-configure-x86-64-macosx.patch.1 | 12
external/firebird/firebird-cygwin-msvc.patch | 687 +++
external/firebird/firebird-cygwin-msvc.patch.1 | 484 ---
external/firebird/firebird-macosx.patch.1| 185 +-
external/firebird/firebird-rpath.patch.0 | 16
external/firebird/firebird.disable-ib-util-not-found.patch.1 |8
external/libtommath/ExternalProject_libtommath.mk| 36
external/libtommath/Makefile |7
external/libtommath/Module_libtommath.mk | 17
external/libtommath/README |6
external/libtommath/UnpackedTarball_libtommath.mk| 20
external/libtommath/libtommath-msvc.patch| 12
24 files changed, 1060 insertions(+), 673 deletions(-)
New commits:
commit 45f42681f4d1260c42140a313560534e605f81a4
Author: Wastack <btom...@gmail.com>
Date: Thu Jul 28 17:16:19 2016 +0200
GSoC Upgrade firebird to 3.0
Embedded firebird is now version 3.0.
Supports MSVC 14.0.
Instead of fbembed, there are now two libraries: fbclient and
Engine12. fbclient is linked as fbembed before, Engine12 is loaded
at runtime from fbclient.
fb now needs system libtommath, which is supplied
as a new ExternalProject of LO.
Change-Id: I132939bdee745795b22f675e4265e9590079c45f
Reviewed-on: https://gerrit.libreoffice.org/27642
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
diff --git a/Makefile.fetch b/Makefile.fetch
index ea7b343..dc2f648 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -160,6 +160,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \
$(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \
$(call fetch_Optional,LIBPNG,PNG_TARBALL) \
+ $(call fetch_Optional,LIBTOMMATH,LIBTOMMATH_TARBALL) \
$(call fetch_Optional,LIBXML2,LIBXML_TARBALL) \
LIBXMLSEC_TARBALL \
$(call fetch_Optional,LIBXSLT,LIBXSLT_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 806a5e8..0345edc 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2901,6 +2901,36 @@ endef
endif # SYSTEM_OPENLDAP
+ifneq ($(SYSTEM_LIBTOMMATH),)
+
+define gb_LinkTarget__use_libtommath
+$(call gb_LinkTarget_set_include,$(1),\
+ $(LIBTOMMATH_CFLAGS) \
+ $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBTOMMATH_LIBS))
+
+endef
+
+else # !SYSTEM_LIBTOMMATH
+define gb_LinkTarget__use_libtommath
+$(call gb_LinkTarget_set_include,$(1),\
+ -I${WORKDIR}/UnpackedTarball/libtommath \
+ $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+ $(call
gb_UnpackedTarball_get_dir,libtommath)/libtommath$(gb_StaticLibrary_PLAINEXT) \
+)
+$(call gb_LinkTarget_use_external_project,$(1),libtommath)
+
+endef
+
+endif # SYSTEM_LIBTOMMATH
+
+define gb_ExternalProject__use_libtommath
+$(call gb_ExternalProject_use_external_project,$(1),libtommath)
+
+endef
ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
@@ -2915,38 +2945,29 @@ $(call gb_LinkTarget_add_libs,$(1),$(FIREBIRD_LIBS))
endef
-# gb_LinkTarget__use_atomic_ops :=
-# gb_LinkTarget__use_tommath :=
-
else # !SYSTEM_FIREBIRD
#$(call gb_LinkTarget__use_libatomic_ops,$(1))
+#$(call gb_LinkTarget__use_libtommath,$(1))
define gb_LinkTarget__use_libfbembed
$(call gb_LinkTarget_use_package,$(1),firebird)
$(call gb_LinkTarget_set_include,$(1),\
+ -I$(call
gb_UnpackedTarball_get_dir,firebird)/gen/Release/firebird/include \
$$(INCLUDE) \
- -I$(call gb_UnpackedTarball_get_dir,firebird)/gen/firebird/include \
)
ifeq ($(COM),MSC)
$(call gb_LinkTarget_add_libs,$(1),\
- $(call
gb_UnpackedTarball_get_dir,firebird)/gen/firebird/bin/ifbembed.lib \
+ $(call
gb_UnpackedTarball_get_dir,firebird)/gen/Release/firebird
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/ResultSet.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 70a295ea33c8a8f3f3643733388f9a37dab9f967
Author: Wastack <btom...@gmail.com>
Date: Wed Jul 27 18:05:42 2016 +0200
tdf#91324 GSoC adapt struct tm correctly for date
Change-Id: Id0413d735eeeb506b6e706c5d31e7bf989ab5e41
Reviewed-on: https://gerrit.libreoffice.org/27592
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx
b/connectivity/source/drivers/firebird/ResultSet.cxx
index f0312c5..68517a8 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -442,7 +442,7 @@ Date OResultSet::retrieveValue(const sal_Int32
nColumnIndex, const ISC_SHORT /*n
struct tm aCTime;
isc_decode_sql_date(, );
-return Date(aCTime.tm_mday, aCTime.tm_mon, aCTime.tm_year);
+return Date(aCTime.tm_mday, aCTime.tm_mon + 1, aCTime.tm_year + 1900);
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - connectivity/source
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 120 --
1 file changed, 108 insertions(+), 12 deletions(-)
New commits:
commit 08a7c0af982fec3dfe869d07b549b1f7419d450f
Author: Wastack <btom...@gmail.com>
Date: Sun Jul 3 19:00:31 2016 +0200
tdf#71009 GSoC firebird metadata functions
Implement getImportedKeys funtion in order to have
a working tools->relationships feature.
Change-Id: I7f1660f284bfdc960d3aca034c3d26109770b4cb
Reviewed-on: https://gerrit.libreoffice.org/26882
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Tested-by: Lionel Elie Mamane <lio...@mamane.lu>
(cherry picked from commit ba3f703f01089361ac3ff3d2f231b17097c1d173)
Reviewed-on: https://gerrit.libreoffice.org/27236
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index ad52c01..f5b1a7e 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -32,6 +32,8 @@
#include
#include
#include
+#include
+#include
using namespace connectivity::firebird;
using namespace com::sun::star;
@@ -478,7 +480,7 @@ sal_Bool SAL_CALL
ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLEx
sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( )
throw(SQLException, RuntimeException, std::exception)
{
-return false;
+return true;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatements( ) throw(SQLException,
RuntimeException, std::exception)
@@ -840,9 +842,29 @@ uno::Reference< XConnection > SAL_CALL
ODatabaseMetaData::getConnection()
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( )
throw(SQLException, RuntimeException, std::exception)
{
-OSL_FAIL("Not implemented yet!");
-// TODO implement
-return new
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes);
+ODatabaseMetaDataResultSet* pResultSet = new
+ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes);
+uno::Reference< XResultSet > xResultSet = pResultSet;
+
+ODatabaseMetaDataResultSet::ORows aResults;
+ODatabaseMetaDataResultSet::ORow aRow(2);
+
+aRow[0] = new ORowSetValueDecorator(); // unused
+
+// TODO Put these statics to one place
+// like postgreSQL's Statics class.
+
+aRow[1] = new ORowSetValueDecorator(OUString("TABLE"));
+aResults.push_back(aRow);
+
+aRow[1] = new ORowSetValueDecorator(OUString("VIEW"));
+aResults.push_back(aRow);
+
+aRow[1] = new ORowSetValueDecorator(OUString("SYSTEM TABLE"));
+aResults.push_back(aRow);
+
+pResultSet->setRows(aResults);
+return xResultSet;
}
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
@@ -1465,16 +1487,90 @@ uno::Reference< XResultSet > SAL_CALL
ODatabaseMetaData::getExportedKeys(
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
const Any& catalog, const OUString& schema, const OUString& table )
throw(SQLException, RuntimeException, std::exception)
{
-// List the columns in a table (which must be primary key, or possibly just
-// unique) that are referred to in other foreign keys. Will have a similar
-// 5-table or so join as in getExportedKeys.
-SAL_WARN("connectivity.firebird", "Not yet implemented");
(void) catalog;
(void) schema;
-(void) table;
-OSL_FAIL("Not implemented yet!");
-// TODO implement
-return new
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eImportedKeys);
+
+ODatabaseMetaDataResultSet* pResultSet = new
+ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eImportedKeys);
+uno::Reference< XResultSet > xResultSet = pResultSet;
+
+uno::Reference< XStatement > statement = m_pConnection->createStatement();
+OUString sSQL;
+
+sSQL = "SELECT "
+ "RDB$REF_CONSTRAINTS.RDB$UPDATE_RULE, " // 1 update rule
+ "RDB$REF_CONSTRAINTS.RDB$DELETE_RULE, " // 2 delete rule
+ "RDB$REF_CONSTRAINTS.RDB$CONST_NAME_UQ, " // 3 primary or unique
key name
+ "RDB$REF_CONSTRAINTS.RDB$CONSTRAINT_NAME, " // 4 foreign key name
+ "PRIM.RDB$DEFERRABLE, " // 5 deferrability
+ "PRIM.RDB$INITIALLY_DEFERRED, " // 6 deferrability
+ "PRIM.RDB$RELATION_NAME, " // 7 PK table name
+ "PRIMARY_INDEX.RDB$FIELD_NAME, " // 8 PK column name
+ "PRIMARY_INDEX.RDB$FIELD_POSITION, " // 9 PK sequ
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - connectivity/source
connectivity/source/drivers/firebird/ResultSet.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit f9393f84d539814574b594e173367335fe0c42e8
Author: Wastack <btom...@gmail.com>
Date: Mon Jul 11 17:25:58 2016 +0200
tdf#91324 GSoC adapt struct tm correctly
Change-Id: I645ebe888186e550b95dd072e063260bc69aa178
Reviewed-on: https://gerrit.libreoffice.org/27120
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Tested-by: Lionel Elie Mamane <lio...@mamane.lu>
(cherry picked from commit 88346f606a16865bcf7492f67a7207d0078787a1)
Reviewed-on: https://gerrit.libreoffice.org/27235
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Eike Rathke <er...@redhat.com>
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx
b/connectivity/source/drivers/firebird/ResultSet.cxx
index 89145f4..b4d2472 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -480,10 +480,14 @@ DateTime OResultSet::retrieveValue(const sal_Int32
nColumnIndex, const ISC_SHORT
struct tm aCTime;
isc_decode_timestamp(, );
-// first field is nanoseconds -- not supported in firebird or struct
tm.
-// last field denotes UTC (true) or unknown (false)
-return DateTime(0, aCTime.tm_sec, aCTime.tm_min, aCTime.tm_hour,
aCTime.tm_mday,
-aCTime.tm_mon, aCTime.tm_year, false);
+return DateTime(0, //nanoseconds, not supported
+aCTime.tm_sec,
+aCTime.tm_min,
+aCTime.tm_hour,
+aCTime.tm_mday,
+aCTime.tm_mon + 1, // tm is from 0 to 11
+aCTime.tm_year + 1900, //tm_year is the years since
1900
+false); // denotes UTC (true), or unknown (false)
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - connectivity/source
connectivity/source/drivers/firebird/ResultSet.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit dc0a20cc9b7781b821778d69d2be75e60621e5bc
Author: Wastack <btom...@gmail.com>
Date: Mon Jul 11 17:25:58 2016 +0200
tdf#91324 GSoC adapt struct tm correctly
Change-Id: I645ebe888186e550b95dd072e063260bc69aa178
Reviewed-on: https://gerrit.libreoffice.org/27120
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Tested-by: Lionel Elie Mamane <lio...@mamane.lu>
(cherry picked from commit 88346f606a16865bcf7492f67a7207d0078787a1)
Reviewed-on: https://gerrit.libreoffice.org/27234
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Eike Rathke <er...@redhat.com>
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx
b/connectivity/source/drivers/firebird/ResultSet.cxx
index acfeb8b..ca35c51 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -480,10 +480,14 @@ DateTime OResultSet::retrieveValue(const sal_Int32
nColumnIndex, const ISC_SHORT
struct tm aCTime;
isc_decode_timestamp(, );
-// first field is nanoseconds -- not supported in firebird or struct
tm.
-// last field denotes UTC (true) or unknown (false)
-return DateTime(0, aCTime.tm_sec, aCTime.tm_min, aCTime.tm_hour,
aCTime.tm_mday,
-aCTime.tm_mon, aCTime.tm_year, false);
+return DateTime(0, //nanoseconds, not supported
+aCTime.tm_sec,
+aCTime.tm_min,
+aCTime.tm_hour,
+aCTime.tm_mday,
+aCTime.tm_mon + 1, // tm is from 0 to 11
+aCTime.tm_year + 1900, //tm_year is the years since
1900
+false); // denotes UTC (true), or unknown (false)
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/ResultSet.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 88346f606a16865bcf7492f67a7207d0078787a1
Author: Wastack <btom...@gmail.com>
Date: Mon Jul 11 17:25:58 2016 +0200
tdf#91324 GSoC adapt struct tm correctly
Change-Id: I645ebe888186e550b95dd072e063260bc69aa178
Reviewed-on: https://gerrit.libreoffice.org/27120
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Tested-by: Lionel Elie Mamane <lio...@mamane.lu>
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx
b/connectivity/source/drivers/firebird/ResultSet.cxx
index bd9179e..f0312c5 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -480,10 +480,14 @@ DateTime OResultSet::retrieveValue(const sal_Int32
nColumnIndex, const ISC_SHORT
struct tm aCTime;
isc_decode_timestamp(, );
-// first field is nanoseconds -- not supported in firebird or struct
tm.
-// last field denotes UTC (true) or unknown (false)
-return DateTime(0, aCTime.tm_sec, aCTime.tm_min, aCTime.tm_hour,
aCTime.tm_mday,
-aCTime.tm_mon, aCTime.tm_year, false);
+return DateTime(0, //nanoseconds, not supported
+aCTime.tm_sec,
+aCTime.tm_min,
+aCTime.tm_hour,
+aCTime.tm_mday,
+aCTime.tm_mon + 1, // tm is from 0 to 11
+aCTime.tm_year + 1900, //tm_year is the years since
1900
+false); // denotes UTC (true), or unknown (false)
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/staticanonymous.cxx | 67 ++
1 file changed, 67 insertions(+)
New commits:
commit e097e419ee5c47239262a16526f4e37775fb2004
Author: Wastack <btom...@gmail.com>
Date: Thu Mar 31 08:49:20 2016 +0200
tdf#97966 Compiler plugin
Warns about redundant 'static' keywords in unnamed namespace.
Change-Id: Iecab69161e24d73e39a8dd5baaba6929e12d4f29
Reviewed-on: https://gerrit.libreoffice.org/23679
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/compilerplugins/clang/staticanonymous.cxx
b/compilerplugins/clang/staticanonymous.cxx
new file mode 100644
index 000..da5724b
--- /dev/null
+++ b/compilerplugins/clang/staticanonymous.cxx
@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * Based on LLVM/Clang.
+ *
+ */
+#include "plugin.hxx"
+#include "compat.hxx"
+/*
+This is a compile check.
+
+Warns about functions with static keyword in an unnamed namespace.
+*/
+
+namespace loplugin
+{
+
+class StaticAnonymous
+: public RecursiveASTVisitor< StaticAnonymous >
+, public Plugin
+{
+public:
+StaticAnonymous( const InstantiationData& data );
+virtual void run() override;
+bool VisitFunctionDecl( FunctionDecl* func );
+
+};
+
+StaticAnonymous::StaticAnonymous( const InstantiationData& data )
+: Plugin( data )
+{
+}
+
+void StaticAnonymous::run()
+{
+TraverseDecl( compiler.getASTContext().getTranslationUnitDecl());
+}
+
+
+bool StaticAnonymous::VisitFunctionDecl( FunctionDecl* func )
+
+{
+if( ignoreLocation( func ) )
+return true;
+if( func -> isInAnonymousNamespace () )
+{
+ if ( !isa(func) && !compat::isInExternCContext(*func) )
+ {
+if(func-> getStorageClass() == SC_Static)
+ {
+report( DiagnosticsEngine::Warning,
+"redundant 'static' keyword in unnamed namespace",
+func->getLocStart());
+ }
+ }
+}
+
+return true;
+}
+
+// Register the plugin action with the LO plugin handling.
+static Plugin::Registration< StaticAnonymous > X( "staticanonymous",true);
+
+} // namespace
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source toolkit/source unoxml/source uui/source vcl/source vcl/unx xmloff/source
sw/source/core/bastyp/calc.cxx |2
sw/source/core/crsr/bookmrk.cxx |6 +-
sw/source/core/doc/CntntIdxStore.cxx|6 +-
sw/source/core/doc/DocumentContentOperationsManager.cxx | 42
sw/source/core/doc/DocumentFieldsManager.cxx|4 -
sw/source/core/doc/DocumentRedlineManager.cxx | 10 +--
sw/source/core/doc/DocumentStylePoolManager.cxx | 14 ++---
sw/source/core/doc/SwStyleNameMapper.cxx| 12 ++--
sw/source/core/doc/docbm.cxx| 28 +-
sw/source/core/doc/doccomp.cxx |4 -
sw/source/core/doc/doccorr.cxx |8 +--
sw/source/core/doc/docnum.cxx |2
sw/source/core/draw/dcontact.cxx|2
sw/source/core/layout/flycnt.cxx|2
sw/source/core/text/itrform2.cxx|6 +-
sw/source/core/tox/tox.cxx |2
sw/source/core/txtnode/atrftn.cxx |6 +-
sw/source/core/txtnode/ndtxt.cxx|2
sw/source/core/unocore/unocoll.cxx |4 -
sw/source/core/unocore/unodraw.cxx |2
sw/source/core/unocore/unoportenum.cxx |6 +-
sw/source/core/unocore/unotbl.cxx |2
sw/source/filter/html/css1atr.cxx |2
sw/source/filter/ww8/wrtw8esh.cxx |4 -
sw/source/ui/envelp/envfmt.cxx |4 -
sw/source/uibase/app/apphdl.cxx |2
sw/source/uibase/docvw/HeaderFooterWin.cxx |6 +-
sw/source/uibase/utlui/content.cxx |8 +--
toolkit/source/awt/vclxmenu.cxx |4 -
toolkit/source/awt/vclxtoolkit.cxx |6 +-
toolkit/source/controls/controlmodelcontainerbase.cxx |4 -
toolkit/source/controls/grid/sortablegriddatamodel.cxx |2
toolkit/source/controls/tree/treedatamodel.cxx |2
toolkit/source/controls/unocontrols.cxx |2
unoxml/source/rdf/librdf_repository.cxx | 24 -
uui/source/iahndl.cxx |2
vcl/source/control/field.cxx| 10 +--
vcl/source/control/imp_listbox.cxx |4 -
vcl/source/control/longcurr.cxx | 10 +--
vcl/source/filter/wmf/enhwmf.cxx|2
vcl/source/gdi/print.cxx|4 -
vcl/source/image/ImplImageTree.cxx |6 +-
vcl/source/window/toolbox.cxx |2
vcl/unx/generic/fontmanager/fontconfig.cxx |2
vcl/unx/generic/gdi/salgdi.cxx |4 -
vcl/unx/generic/window/salframe.cxx |2
vcl/unx/gtk/salprn-gtk.cxx | 14 ++---
xmloff/source/core/xmlimp.cxx |2
xmloff/source/forms/propertyimport.cxx |2
xmloff/source/style/xmlaustp.cxx|2
xmloff/source/text/txtexppr.cxx |8 +--
xmloff/source/text/txtimppr.cxx |4 -
xmloff/source/text/txtparae.cxx |4 -
53 files changed, 163 insertions(+), 163 deletions(-)
New commits:
commit 84fd42c1f58627f3e03ee6062fa2812a4890d941
Author: Wastack <btom...@gmail.com>
Date: Thu Mar 31 08:48:33 2016 +0200
tdf#97966 Drop 'static' keywords
Including no keywords from extern "C" blocks
Change-Id: I7769c9d2a131d7389ef6ab08c0fbd12bc624778c
Reviewed-on: https://gerrit.libreoffice.org/23678
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 7625353..c8e0601 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -300,7 +300,7 @@ UUIInteractionHelper::tryOtherInteractionHandler(
namespace
{
-static bool lcl_matchesRequest( const Any& i_rRequest, const OUString&
i_rTypeName, const OUString& i_rPropagation )
+bool lcl_matchesRequest( const Any& i_rRequest, const OUString&
i_rTypeName, const OUString& i_rPropagation )
{
const css::uno::TypeDescription aTypeDesc( i_rTypeName );
const typelib_TypeDescription* pTypeDesc = aTypeDesc.get();
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 75565c5..849f2f0 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -51,7 +51,7 @@ namespace
#define FORMAT_METRIC2
#define FORMAT_CURRENCY 3
-static sal_Int6
[Libreoffice-commits] core.git: 2 commits - pyuno/source reportdesign/source rsc/source sal/rtl sal/textenc sax/qa sax/source sc/source sd/source sfx2/source shell/source slideshow/source stoc/source
pyuno/source/module/pyuno_module.cxx |2
reportdesign/source/ui/report/propbrw.cxx|2
rsc/source/rsc/rsc.cxx |6 -
sal/rtl/strtmpl.cxx |4 -
sal/textenc/convertsimple.cxx|2
sax/qa/cppunit/test_converter.cxx| 14
++--
sax/source/expatwrap/saxwriter.cxx |4 -
sc/source/core/data/cellvalue.cxx|2
sc/source/core/data/formulacell.cxx | 18
++---
sc/source/core/tool/interpr1.cxx |4 -
sc/source/filter/xcl97/xcl97rec.cxx |8 +-
sd/source/ui/framework/tools/FrameworkHelper.cxx |2
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx |4 -
sfx2/source/appl/appserv.cxx |6 -
sfx2/source/dialog/filedlghelper.cxx |2
sfx2/source/doc/guisaveas.cxx|8 +-
sfx2/source/doc/objmisc.cxx |2
sfx2/source/doc/objxtor.cxx |2
shell/source/sessioninstall/SyncDbusSessionHelper.cxx|2
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx |4 -
stoc/source/implementationregistration/implreg.cxx | 34
+-
stoc/source/javavm/javavm.cxx|2
stoc/source/proxy_factory/proxyfac.cxx |6 -
stoc/source/security/access_controller.cxx |2
stoc/source/servicemanager/servicemanager.cxx|2
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx|2
svgio/qa/cppunit/SvgImportTest.cxx |2
svtools/source/control/calendar.cxx |2
svtools/source/table/gridtablerenderer.cxx |6 -
svtools/source/uno/unoiface.cxx |2
svtools/source/uno/wizard/unowizard.cxx |6 -
svx/source/accessibility/AccessibleControlShape.cxx |8 +-
svx/source/fmcomp/gridcell.cxx | 12 +--
svx/source/form/fmcontrollayout.cxx |4 -
svx/source/form/fmpgeimp.cxx |4 -
svx/source/form/fmshimp.cxx |2
svx/source/form/fmtextcontrolshell.cxx |2
svx/source/form/fmtools.cxx |2
svx/source/form/formcontrolfactory.cxx |6 -
svx/source/form/formcontroller.cxx |2
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx |2
svx/source/unodraw/unoshap2.cxx | 10 +-
42 files changed, 109 insertions(+), 109 deletions(-)
New commits:
commit cb495d71063d60da46215a2510736eccd910fa7a
Author: Wastack <btom...@gmail.com>
Date: Thu Mar 31 08:46:49 2016 +0200
tdf#97966 Drop 'static' keywords
Including no keywords from extern "C" blocks
Change-Id: I364aa7d67c2bf867588798e07df95c3f3f2bd7f3
Reviewed-on: https://gerrit.libreoffice.org/23676
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index ac7e4c2..d70d9a7 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -1394,7 +1394,7 @@ int permutation256 [256]= {
116, 171, 99, 202, 7, 107, 253, 108
};
-static void initPermTexture(GLuint *texID)
+void initPermTexture(GLuint *texID)
{
CHECK_GL_ERROR();
glGenTextures(1, texID);
@@ -1597,7 +1597,7 @@ GLuint VortexTransition::makeShader() const
return OpenGLHelper::LoadShaders( "vortexVertexShader",
"vortexFragmentShader", "vortexGeometryShader" );
}
-static glm::mat4 lookAt(glm::vec3 eye, glm::vec3 center, glm::vec3 up) {
+glm::mat4 lookAt(glm::vec3 eye, glm::vec3 center, glm::vec3 up) {
glm::vec3 f = glm::normalize(center - eye);
glm::vec3 u = glm::normalize(up);
glm::vec3 s = glm::normalize(glm::cross(f, u));
diff --git a/stoc/source/implementationregistration/implreg.cxx
b/stoc/source/imp
[Libreoffice-commits] core.git: 2 commits - extensions/source filter/source forms/source fpicker/source framework/source i18nlangtag/qa l10ntools/source oox/source
extensions/source/propctrlr/eventhandler.cxx |2 -
extensions/source/propctrlr/formgeometryhandler.cxx |2 -
extensions/source/propctrlr/pushbuttonnavigation.cxx |4 +--
filter/source/svg/svgreader.cxx |4 +--
forms/source/component/DatabaseForm.cxx |2 -
forms/source/component/propertybaghelper.cxx |2 -
forms/source/misc/InterfaceContainer.cxx |2 -
forms/source/richtext/richtextcontrol.cxx | 12
+-
forms/source/richtext/rtattributehandler.cxx |2 -
forms/source/runtime/formoperations.cxx |6 ++---
forms/source/solar/component/navbarcontrol.cxx|2 -
forms/source/solar/control/navtoolbar.cxx |4 +--
forms/source/xforms/datatypes.cxx |4 +--
fpicker/source/office/iodlg.cxx |2 -
framework/source/services/substitutepathvars.cxx |2 -
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx |4 +--
framework/source/uiconfiguration/uiconfigurationmanager.cxx |4 +--
framework/source/uielement/popuptoolbarcontroller.cxx |2 -
framework/source/uielement/statusbarmanager.cxx |2 -
framework/source/uielement/statusbarmerger.cxx| 10
i18nlangtag/qa/cppunit/test_languagetag.cxx |2 -
l10ntools/source/export.cxx |4 +--
l10ntools/source/lngmerge.cxx |2 -
l10ntools/source/treemerge.cxx|6 ++---
l10ntools/source/xmlparse.cxx |6 ++---
oox/source/mathml/importutils.cxx |2 -
26 files changed, 48 insertions(+), 48 deletions(-)
New commits:
commit 1271eadfac7e77ff7b249e64be3857ffdc0a261c
Author: Wastack <btom...@gmail.com>
Date: Thu Mar 31 08:43:53 2016 +0200
tdf#97966 Drop 'static' keywords
Including no keywords from extern "C" blocks
Change-Id: Id9dd5a53d6ea5134ebb473bd0463f8f42965a211
Reviewed-on: https://gerrit.libreoffice.org/23674
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/framework/source/services/substitutepathvars.cxx
b/framework/source/services/substitutepathvars.cxx
index 3827e32..6263417 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -456,7 +456,7 @@ void SubstitutePathVariables_Impl::ImplCommit()
{
}
-static inline OperatingSystem GetOperatingSystem()
+inline OperatingSystem GetOperatingSystem()
{
#ifdef SOLARIS
return OS_SOLARIS;
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index b862ad8..15b26ba 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -238,7 +238,7 @@ static const char RESOURCEURL_PREFIX[] =
"private:resource/";
static const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17;
static const char RESOURCEURL_CUSTOM_ELEMENT[] = "custom_";
-static sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL )
+sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL )
{
if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) &&
@@ -260,7 +260,7 @@ static sal_Int16 RetrieveTypeFromResourceURL( const
OUString& aResourceURL )
return ui::UIElementType::UNKNOWN;
}
-static OUString RetrieveNameFromResourceURL( const OUString& aResourceURL )
+OUString RetrieveNameFromResourceURL( const OUString& aResourceURL )
{
if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) &&
( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index f90ef07..1bcb6ce 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -214,7 +214,7 @@ static const char* UIELEMENTTYPENAMES[] =
static const char RESOURCEURL_PREFIX[] = "private:resource/";
static const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17;
-static sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL )
+sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL )
{
if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) &&
@@ -236,7 +236,7 @@
[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source desktop/source
dbaccess/qa/unit/data/hsqldb_empty.odb.lck|binary
dbaccess/source/core/api/resultset.cxx|2 +-
dbaccess/source/core/dataaccess/ModelImpl.cxx |2 +-
dbaccess/source/core/dataaccess/databasedocument.cxx |8
dbaccess/source/core/dataaccess/documenteventexecutor.cxx |2 +-
dbaccess/source/core/recovery/dbdocrecovery.cxx | 14 +++---
dbaccess/source/core/recovery/subcomponentrecovery.cxx|8
dbaccess/source/ext/macromigration/migrationengine.cxx| 12 ++--
dbaccess/source/ext/macromigration/migrationlog.cxx |2 +-
dbaccess/source/ui/app/AppDetailPageHelper.cxx|2 +-
dbaccess/source/ui/dlg/sqlmessage.cxx |2 +-
dbaccess/source/ui/misc/UITools.cxx |2 +-
dbaccess/source/ui/misc/imageprovider.cxx |4 ++--
desktop/source/app/dispatchwatcher.cxx|2 +-
desktop/source/deployment/misc/dp_misc.cxx|2 +-
15 files changed, 32 insertions(+), 32 deletions(-)
New commits:
commit 9e596250a6e968c5d1e2fb0de582ae242e02acf9
Author: Wastack <btom...@gmail.com>
Date: Thu Mar 31 08:40:23 2016 +0200
tdf#97966 Drop 'static' keywords
Including no keywords from extern "C" blocks
Change-Id: Icff7c0308843d6a7608be24d7fcf11fa079c7b72
Reviewed-on: https://gerrit.libreoffice.org/23672
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/dbaccess/qa/unit/data/hsqldb_empty.odb.lck
b/dbaccess/qa/unit/data/hsqldb_empty.odb.lck
new file mode 100644
index 000..d64ce94
Binary files /dev/null and b/dbaccess/qa/unit/data/hsqldb_empty.odb.lck differ
diff --git a/dbaccess/source/core/api/resultset.cxx
b/dbaccess/source/core/api/resultset.cxx
index e69cf2b..f268810 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -295,7 +295,7 @@ sal_Int32 OResultSet::findColumn(const OUString&
columnName) throw( SQLException
namespace
{
-static Reference< XDatabaseMetaData >
lcl_getDBMetaDataFromStatement_nothrow( const Reference< XInterface >&
_rxStatement )
+Reference< XDatabaseMetaData > lcl_getDBMetaDataFromStatement_nothrow(
const Reference< XInterface >& _rxStatement )
{
Reference< XDatabaseMetaData > xDBMetaData;
try
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 318ed94..9df76e5 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1193,7 +1193,7 @@ namespace
namespace
{
-static void lcl_rebaseScriptStorage_throw( const Reference<
XStorageBasedLibraryContainer >& _rxContainer,
+void lcl_rebaseScriptStorage_throw( const Reference<
XStorageBasedLibraryContainer >& _rxContainer,
const Reference< XStorage >& _rxNewRootStorage )
{
if ( _rxContainer.is() )
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index dc1f629..2922e8e 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -285,7 +285,7 @@ namespace
return _rArguments.getOrDefault( "StatusIndicator", xStatusIndicator );
}
-static void lcl_triggerStatusIndicator_throw( const
::comphelper::NamedValueCollection& _rArguments, DocumentGuard& _rGuard, const
bool _bStart )
+void lcl_triggerStatusIndicator_throw( const
::comphelper::NamedValueCollection& _rArguments, DocumentGuard& _rGuard, const
bool _bStart )
{
Reference< XStatusIndicator > xStatusIndicator(
lcl_extractStatusIndicator( _rArguments ) );
if ( !xStatusIndicator.is() )
@@ -307,7 +307,7 @@ namespace
// note that |reset| can throw a DisposedException
}
-static void lcl_extractStatusIndicator( const
::comphelper::NamedValueCollection& _rArguments, Sequence< Any >& _rCallArgs )
+void lcl_extractStatusIndicator( const ::comphelper::NamedValueCollection&
_rArguments, Sequence< Any >& _rCallArgs )
{
Reference< XStatusIndicator > xStatusIndicator(
lcl_extractStatusIndicator( _rArguments ) );
if ( !xStatusIndicator.is() )
@@ -318,7 +318,7 @@ namespace
_rCallArgs[ nLength ] <<= xStatusIndicator;
}
-static void lcl_extractAndStartStatusIndicator( const
::comphelper::NamedValueCollection& _rArguments, Reference< XStatusIndicator >&
_rxStatusIndicator,
+void lcl_extractAndStartStatusIndicator( const
::comphelper::NamedValueCollection& _rArguments, Reference< XStatusIndicator >&
[Libreoffice-commits] core.git: 2 commits - accessibility/source basctl/source basic/source chart2/source codemaker/source comphelper/source connectivity/source cppu/source cui/source
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx |4 ++--
accessibility/source/extended/AccessibleGridControlTableCell.cxx |2 +-
basctl/source/basicide/scriptdocument.cxx|2 +-
basic/source/basmgr/vbahelper.cxx|2 +-
chart2/source/model/template/PieChartTypeTemplate.cxx|2 +-
chart2/source/view/main/AbstractShapeFactory.cxx |2 +-
codemaker/source/cppumaker/cpputype.cxx |2 +-
comphelper/source/misc/accessibleeventnotifier.cxx |6 +++---
connectivity/source/commontools/FValue.cxx |4 ++--
connectivity/source/commontools/dbmetadata.cxx | 10
+-
connectivity/source/commontools/dbtools.cxx |2 +-
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |2 +-
connectivity/source/parse/sqliterator.cxx|4 ++--
cppu/source/uno/lbenv.cxx|6 +++---
cui/source/customize/cfgutil.cxx |4 ++--
cui/source/customize/selector.cxx|4 ++--
cui/source/options/optgdlg.cxx |4 ++--
17 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit 62d1632498d92b6e73b952c9d379edebe3052341
Author: Wastack <btom...@gmail.com>
Date: Thu Mar 31 08:38:10 2016 +0200
tdf#97966 Drop 'static' keywords
Including no keywords from extern "C" blocks
Change-Id: I18ddafbf3d41f6779fb43e36ba1f1c48b37757a0
Reviewed-on: https://gerrit.libreoffice.org/23671
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/connectivity/source/commontools/FValue.cxx
b/connectivity/source/commontools/FValue.cxx
index 944ebe0..b9d6fc9 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -38,7 +38,7 @@ namespace connectivity
{
namespace {
-static bool isStorageCompatible(sal_Int32 _eType1, sal_Int32 _eType2)
+bool isStorageCompatible(sal_Int32 _eType1, sal_Int32 _eType2)
{
bool bIsCompatible = true;
@@ -104,7 +104,7 @@ namespace {
return bIsCompatible;
}
-static bool isStorageComparable(sal_Int32 _eType1, sal_Int32 _eType2)
+bool isStorageComparable(sal_Int32 _eType1, sal_Int32 _eType2)
{
bool bIsComparable = true;
diff --git a/connectivity/source/commontools/dbmetadata.cxx
b/connectivity/source/commontools/dbmetadata.cxx
index f1a66cf..eb7cee3 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -95,7 +95,7 @@ namespace dbtools
namespace
{
-static void lcl_construct( DatabaseMetaData_Impl& _metaDataImpl, const
Reference< XConnection >& _connection )
+void lcl_construct( DatabaseMetaData_Impl& _metaDataImpl, const
Reference< XConnection >& _connection )
{
_metaDataImpl.xConnection = _connection;
if ( !_metaDataImpl.xConnection.is() )
@@ -107,7 +107,7 @@ namespace dbtools
}
-static void lcl_checkConnected( const DatabaseMetaData_Impl&
_metaDataImpl )
+void lcl_checkConnected( const DatabaseMetaData_Impl& _metaDataImpl )
{
if ( !_metaDataImpl.xConnection.is() ||
!_metaDataImpl.xConnectionMetaData.is() )
{
@@ -118,7 +118,7 @@ namespace dbtools
}
-static bool lcl_getDriverSetting( const sal_Char* _asciiName, const
DatabaseMetaData_Impl& _metaData, Any& _out_setting )
+bool lcl_getDriverSetting( const sal_Char* _asciiName, const
DatabaseMetaData_Impl& _metaData, Any& _out_setting )
{
lcl_checkConnected( _metaData );
const ::comphelper::NamedValueCollection& rDriverMetaData =
_metaData.aDriverConfig.getMetaData( _metaData.xConnectionMetaData->getURL() );
@@ -129,7 +129,7 @@ namespace dbtools
}
-static bool lcl_getConnectionSetting( const sal_Char* _asciiName,
const DatabaseMetaData_Impl& _metaData, Any& _out_setting )
+bool lcl_getConnectionSetting( const sal_Char* _asciiName, const
DatabaseMetaData_Impl& _metaData, Any& _out_setting )
{
try
{
@@ -160,7 +160,7 @@ namespace dbtools
}
-static const OUString& lcl_getConnectionStringSetting(
+const OUString& lcl_getConnectionStringSetting(
const DatabaseMetaData_Impl& _metaData, ::boost::optional<
OUString >& _cachedSetting,
OUString (SAL_CALL XDatabaseMetaData::*_getter)() )
{
diff --git a/connectivity/source/commontools/dbtools.cxx
b/connectivity/sour
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/merge.cxx |4 ++--
l10ntools/source/po.cxx|8
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 14060e76e33cfb305c1469fecf7db688bf8a8858
Author: Wastack <btom...@gmail.com>
Date: Tue Mar 29 23:49:41 2016 +0200
tdf#97966 Drop 'static' keywords
Change-Id: I2e495243b75fc239dafbf63c7644115f0a923f4a
Reviewed-on: https://gerrit.libreoffice.org/23607
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 7789e3b..7ee2360 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -29,7 +29,7 @@
namespace
{
-static OString lcl_NormalizeFilename(const OString& rFilename)
+OString lcl_NormalizeFilename(const OString& rFilename)
{
return rFilename.copy(
std::max(
@@ -37,7 +37,7 @@ namespace
rFilename.lastIndexOf( '/' ))+1);
};
-static bool lcl_ReadPoChecked(
+bool lcl_ReadPoChecked(
PoEntry& o_rPoEntry, PoIfstream& rPoFile,
const OString& rFileName)
{
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 6aa7c1d..1d8223e 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -87,7 +87,7 @@ public:
namespace
{
// Convert a normal string to msg/po output string
-static OString lcl_GenMsgString(const OString& rString)
+OString lcl_GenMsgString(const OString& rString)
{
if ( rString.isEmpty() )
return "\"\"";
@@ -114,7 +114,7 @@ namespace
}
// Convert msg string to normal form
-static OString lcl_GenNormString(const OString& rString)
+OString lcl_GenNormString(const OString& rString)
{
return
helper::unEscapeAll(
@@ -406,7 +406,7 @@ OString PoEntry::genKeyId(const OString& rGenerator)
namespace
{
// Get actual time in "YEAR-MO-DA HO:MI+ZONE" form
-static OString lcl_GetTime()
+OString lcl_GetTime()
{
time_t aNow = time(nullptr);
struct tm* pNow = localtime();
@@ -511,7 +511,7 @@ namespace
{
// Check the validity of read entry
-static bool lcl_CheckInputEntry(const GenPoEntry& rEntry)
+bool lcl_CheckInputEntry(const GenPoEntry& rEntry)
{
const OString sMsgCtxt = rEntry.getMsgCtxt();
const sal_Int32 nFirstEndLine = sMsgCtxt.indexOf('\n');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source comphelper/source forms/source framework/source l10ntools/source sw/source tools/source
chart2/source/model/template/PieChartType.cxx |2 +-
comphelper/source/property/propertystatecontainer.cxx |2 +-
forms/source/richtext/clipboarddispatcher.cxx |2 +-
forms/source/richtext/parametrizedattributedispatcher.cxx |2 +-
forms/source/richtext/richtextimplcontrol.cxx |2 +-
framework/source/uielement/statusbaritem.cxx |2 +-
framework/source/uifactory/addonstoolbarfactory.cxx |2 +-
l10ntools/source/propmerge.cxx|6 +++---
sw/source/core/crsr/crbm.cxx |4 ++--
tools/source/misc/cpuid.cxx |4 ++--
10 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit ce549d2a09ad9884a7e598162cf0ca6b6bc3150c
Author: Wastack <btom...@gmail.com>
Date: Fri Mar 11 01:07:08 2016 +0100
tdf#97966: Remove 'static' keywords
Change-Id: Iced527f48afa828cc9acf5b6461674a2706cbcd7
Reviewed-on: https://gerrit.libreoffice.org/23135
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/chart2/source/model/template/PieChartType.cxx
b/chart2/source/model/template/PieChartType.cxx
index f036ebc..b95d083 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -46,7 +46,7 @@ enum
PROP_PIECHARTTYPE_3DRELATIVEHEIGHT
};
-static void lcl_AddPropertiesToVector(
+void lcl_AddPropertiesToVector(
::std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
diff --git a/comphelper/source/property/propertystatecontainer.cxx
b/comphelper/source/property/propertystatecontainer.cxx
index 01cfe36..b315a66 100644
--- a/comphelper/source/property/propertystatecontainer.cxx
+++ b/comphelper/source/property/propertystatecontainer.cxx
@@ -31,7 +31,7 @@ namespace comphelper
namespace
{
-static OUString lcl_getUnknownPropertyErrorMessage( const OUString&
_rPropertyName )
+OUString lcl_getUnknownPropertyErrorMessage( const OUString&
_rPropertyName )
{
// TODO: perhaps it's time to think about resources in the
comphelper module?
// Would be nice to have localized exception strings (a simply
resource file containing
diff --git a/forms/source/richtext/clipboarddispatcher.cxx
b/forms/source/richtext/clipboarddispatcher.cxx
index 09cbdbc..00d5ade 100644
--- a/forms/source/richtext/clipboarddispatcher.cxx
+++ b/forms/source/richtext/clipboarddispatcher.cxx
@@ -38,7 +38,7 @@ namespace frm
namespace
{
-static URL createClipboardURL( OClipboardDispatcher::ClipboardFunc
_eFunc )
+URL createClipboardURL( OClipboardDispatcher::ClipboardFunc _eFunc )
{
URL aURL;
switch ( _eFunc )
diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx
b/forms/source/richtext/parametrizedattributedispatcher.cxx
index 47fe59a..607cba9 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.cxx
+++ b/forms/source/richtext/parametrizedattributedispatcher.cxx
@@ -53,7 +53,7 @@ namespace frm
namespace
{
-static SfxSlotId lcl_normalizeLatinScriptSlotId( SfxSlotId _nSlotId )
+SfxSlotId lcl_normalizeLatinScriptSlotId( SfxSlotId _nSlotId )
{
switch ( _nSlotId )
{
diff --git a/forms/source/richtext/richtextimplcontrol.cxx
b/forms/source/richtext/richtextimplcontrol.cxx
index 24c5b04..6bb6849 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -543,7 +543,7 @@ namespace frm
namespace
{
-static void lcl_inflate( Rectangle& _rRect, long _nInflateX, long
_nInflateY )
+void lcl_inflate( Rectangle& _rRect, long _nInflateX, long _nInflateY )
{
_rRect.Left() -= _nInflateX;
_rRect.Right() += _nInflateX;
diff --git a/framework/source/uielement/statusbaritem.cxx
b/framework/source/uielement/statusbaritem.cxx
index c33bd04..a69baac 100644
--- a/framework/source/uielement/statusbaritem.cxx
+++ b/framework/source/uielement/statusbaritem.cxx
@@ -33,7 +33,7 @@ namespace framework
namespace
{
-static sal_uInt16 impl_convertItemBitsToItemStyle( sal_Int16 nItemBits )
+sal_uInt16 impl_convertItemBitsToItemStyle( sal_Int16 nItemBits )
{
sal_uInt16 nStyle( 0 );
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx
b/framework/source/uifactory/addonstoolbarfactory.cxx
index c1356d5..2003669 100644
--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -98,7 +98,7 @@ AddonsToolBarFactory::~AddonsToolBarFactory()
{
}
-static bool IsCorrectContext( const OUString& rModuleIdentifier, const
OUString& aContextList )
+bool IsCorrectContext( const OUStri
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/cstylecast.cxx |2 +-
compilerplugins/clang/fpcomparison.cxx |4 ++--
compilerplugins/clang/mergeclasses.cxx |8
compilerplugins/clang/staticmethods.cxx|2 +-
compilerplugins/clang/store/removevirtuals.cxx |4 ++--
compilerplugins/clang/store/unnecessaryvirtual.cxx |2 +-
compilerplugins/clang/unusedfieldsremove.cxx |4 ++--
compilerplugins/clang/unusedmethodsremove.cxx |4 ++--
8 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 9a13cff64783a7de3dce7d484c150605bd42a4d6
Author: Wastack <btom...@gmail.com>
Date: Fri Mar 11 01:00:27 2016 +0100
tdf#97966: Remove 'static' keywords
Change-Id: Id991cead4f01830eafd9cf8dd63b519ef07c9451
Reviewed-on: https://gerrit.libreoffice.org/23134
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/compilerplugins/clang/cstylecast.cxx
b/compilerplugins/clang/cstylecast.cxx
index ce4b8b6..e33e905 100644
--- a/compilerplugins/clang/cstylecast.cxx
+++ b/compilerplugins/clang/cstylecast.cxx
@@ -110,7 +110,7 @@ private:
bool externCFunction;
};
-static const char * recommendedFix(clang::CastKind ck) {
+const char * recommendedFix(clang::CastKind ck) {
switch(ck) {
case CK_IntegralToPointer: return "reinterpret_cast";
case CK_PointerToIntegral: return "reinterpret_cast";
diff --git a/compilerplugins/clang/fpcomparison.cxx
b/compilerplugins/clang/fpcomparison.cxx
index 8d20b8c..491eb80 100644
--- a/compilerplugins/clang/fpcomparison.cxx
+++ b/compilerplugins/clang/fpcomparison.cxx
@@ -40,7 +40,7 @@ private:
EState meState = EState::None;
};
-static const std::set whitelist {
+const std::set whitelist {
"rtl::math::approxEqual",
"(anonymous namespace)::doubleToString",
"(anonymous namespace)::stringToDouble",
@@ -95,7 +95,7 @@ bool FpComparison::ignore(FunctionDecl* function)
return false;
}
-static bool isZeroConstant(ASTContext& context, const Expr* expr)
+bool isZeroConstant(ASTContext& context, const Expr* expr)
{
if (!expr->getType()->isFloatingType()) {
return false;
diff --git a/compilerplugins/clang/mergeclasses.cxx
b/compilerplugins/clang/mergeclasses.cxx
index 72e4f32..6fcee44 100644
--- a/compilerplugins/clang/mergeclasses.cxx
+++ b/compilerplugins/clang/mergeclasses.cxx
@@ -79,11 +79,11 @@ public:
bool VisitCallExpr(const CallExpr* decl);
};
-static bool startsWith(const std::string& rStr, const char* pSubStr) {
+bool startsWith(const std::string& rStr, const char* pSubStr) {
return rStr.compare(0, strlen(pSubStr), pSubStr) == 0;
}
-static void addToInstantiatedSet(const std::string& s)
+void addToInstantiatedSet(const std::string& s)
{
// ignore stuff in the standard library, and UNO stuff we can't touch.
if (startsWith(s, "rtl::") || startsWith(s, "sal::") || startsWith(s,
"com::sun::")
@@ -161,12 +161,12 @@ bool MergeClasses::VisitFunctionDecl(const FunctionDecl*
decl)
return true;
}
-static bool startswith(const std::string& s, const std::string& prefix)
+bool startswith(const std::string& s, const std::string& prefix)
{
return s.rfind(prefix,0) == 0;
}
-static bool endswith(const std::string& s, const std::string& suffix)
+bool endswith(const std::string& s, const std::string& suffix)
{
return s.rfind(suffix) == (s.size()-suffix.size());
}
diff --git a/compilerplugins/clang/staticmethods.cxx
b/compilerplugins/clang/staticmethods.cxx
index d4edb1a..43e0f73 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -67,7 +67,7 @@ std::string StaticMethods::getFilename(SourceLocation loc)
return compiler.getSourceManager().getFilename(spellingLocation);
}
-static bool startsWith(const std::string& rStr, const char* pSubStr) {
+bool startsWith(const std::string& rStr, const char* pSubStr) {
return rStr.compare(0, strlen(pSubStr), pSubStr) == 0;
}
diff --git a/compilerplugins/clang/store/removevirtuals.cxx
b/compilerplugins/clang/store/removevirtuals.cxx
index 86f4477..da204d3 100644
--- a/compilerplugins/clang/store/removevirtuals.cxx
+++ b/compilerplugins/clang/store/removevirtuals.cxx
@@ -44,7 +44,7 @@ private:
char* mmappedData;
};
-static size_t getFilesize(const char* filename)
+size_t getFilesize(const char* filename)
{
struct stat st;
stat(filename, );
@@ -71,7 +71,7 @@ RemoveVirtuals::~RemoveVirtuals()
close(mmapFD);
}
-static std::string niceName(const CXXMethodDecl* functionDecl)
+std::string niceName(const CXXMethodDecl* functionDecl)
{
std::string s =
functionDecl->getParent()->getQualifiedNameAsString() + "
[Libreoffice-commits] core.git: connectivity/source dbaccess/source extensions/source filter/source sdext/source writerperfect/qa
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx |4 ++--
dbaccess/source/core/dataaccess/documentevents.cxx |2 +-
extensions/source/resource/ResourceIndexAccess.cxx |2 +-
filter/source/msfilter/util.cxx|6 +++---
sdext/source/pdfimport/sax/saxattrlist.cxx |2 +-
sdext/source/pdfimport/services.cxx| 12 ++--
writerperfect/qa/unit/DirectoryStreamTest.cxx |2 +-
7 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 018c6adf85097d07a0b0fbce3d7155ca5a369ae1
Author: Wastack <btom...@gmail.com>
Date: Fri Mar 11 00:49:47 2016 +0100
tdf#97966: Remove 'static' keywords
Change-Id: I0d9837a7ccecd606e0d43b53f8b920547b0d0bcd
Reviewed-on: https://gerrit.libreoffice.org/23132
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 24492f1..d3410ba 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::mozilla;
namespace
{
-static OUString lcl_getUserDataDirectory()
+OUString lcl_getUserDataDirectory()
{
::osl::Security aSecurity;
OUString aConfigPath;
@@ -90,7 +90,7 @@ namespace
};
-static OUString lcl_guessProfileRoot( MozillaProductType _product )
+OUString lcl_guessProfileRoot( MozillaProductType _product )
{
size_t productIndex = _product - 1;
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx
b/dbaccess/source/core/dataaccess/documentevents.cxx
index 3d00576..37d364d 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -73,7 +73,7 @@ namespace dbaccess
namespace
{
-static const DocumentEventData* lcl_getDocumentEventData()
+const DocumentEventData* lcl_getDocumentEventData()
{
static const DocumentEventData s_aData[] = {
{ "OnCreate", true },
diff --git a/extensions/source/resource/ResourceIndexAccess.cxx
b/extensions/source/resource/ResourceIndexAccess.cxx
index 63bfee9..5141b20 100644
--- a/extensions/source/resource/ResourceIndexAccess.cxx
+++ b/extensions/source/resource/ResourceIndexAccess.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star::container;
namespace
{
-static std::shared_ptr GetResMgr(Sequence const& rArgs)
+std::shared_ptr GetResMgr(Sequence const& rArgs)
{
if(rArgs.getLength()!=1)
return std::shared_ptr();
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 6874111..89ab37a 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -1231,7 +1231,7 @@ namespace
// Scheme means pattern of chromatic values.
// [2,2,1] -> red and green are approximately equal and blue is the dominant
color (e.g. blue)
// [1,1,1] -> all chromatic values are approximately equal (e.g. white, gray,
black)
-static void CalculateScheme(const BitmapColor& rBitmapColor, std::vector
, sal_uInt16 nVariance)
+void CalculateScheme(const BitmapColor& rBitmapColor, std::vector
, sal_uInt16 nVariance)
{
vScheme.resize(3,1);
if( rBitmapColor.GetRed() < rBitmapColor.GetGreen() + nVariance )
@@ -1248,7 +1248,7 @@ static void CalculateScheme(const BitmapColor&
rBitmapColor, std::vector
++vScheme[2];
}
-static bool HasSimilarScheme(const BitmapColor& rBitmapColor1, const
BitmapColor& rBitmapColor2, sal_uInt16 nVariance)
+bool HasSimilarScheme(const BitmapColor& rBitmapColor1, const BitmapColor&
rBitmapColor2, sal_uInt16 nVariance)
{
std::vector vScheme1, vScheme2;
CalculateScheme(rBitmapColor1, vScheme1, nVariance);
@@ -1262,7 +1262,7 @@ static bool HasSimilarScheme(const BitmapColor&
rBitmapColor1, const BitmapColor
}
// Find the best match in the color palette using scheme of the input color
-static sal_uInt16 GetBestIndex(const BitmapPalette& rPalette, const
BitmapColor& rBitmapColor)
+sal_uInt16 GetBestIndex(const BitmapPalette& rPalette, const BitmapColor&
rBitmapColor)
{
sal_uInt16 nReturn = 0;
sal_uInt16 nLastErr = SAL_MAX_UINT16;
diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx
b/sdext/source/pdfimport/sax/saxattrlist.cxx
index 87d804b..6fa5db9 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.cxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.cxx
@@ -48,7 +48,7 @@ SaxAttrList::~SaxAttrList()
}
namespace {
-static OUString getCDATAString()
+OUString getCDATAString()
{
return OUString( "CDATA"
[Libreoffice-commits] core.git: svx/source vcl/source xmloff/source xmlsecurity/source
svx/source/form/fmPropBrw.cxx |2 +-
svx/source/unodraw/recoveryui.cxx |6 +++---
vcl/source/app/brand.cxx |4 ++--
xmloff/source/transform/XMLFilterRegistration.cxx |2 +-
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx |2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 7a0b8decb7d81fefced39ee04368dd0112e8ac28
Author: Wastack <btom...@gmail.com>
Date: Fri Mar 11 00:43:10 2016 +0100
tdf#97966: Remove 'static' keywords
Change-Id: Id70f9e55fb4ad7d3a501399b055208ea10369c82
Reviewed-on: https://gerrit.libreoffice.org/23131
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index aff1df1..af7487d 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -491,7 +491,7 @@ IMPL_LINK_NOARG_TYPED( FmPropBrw, OnAsyncGetFocus, void*,
void )
namespace
{
-static bool lcl_shouldEnableHelpSection( const Reference<
XComponentContext >& _rxContext )
+bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >&
_rxContext )
{
::utl::OConfigurationTreeRoot aConfiguration(
::utl::OConfigurationTreeRoot::createWithComponentContext(
diff --git a/svx/source/unodraw/recoveryui.cxx
b/svx/source/unodraw/recoveryui.cxx
index 7f436f9..ef3701b 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -176,7 +176,7 @@ css::uno::Any SAL_CALL
RecoveryUI::dispatchWithReturnValue(const css::util::URL&
}
-static OUString GetCrashConfigDir()
+OUString GetCrashConfigDir()
{
#if defined(_WIN32)
@@ -202,14 +202,14 @@ static OUString GetCrashConfigDir()
#endif
-static OUString GetUnsentURL()
+OUString GetUnsentURL()
{
OUString aURL = GetCrashConfigDir() + "/" LCKFILE;
return aURL;
}
-static bool delete_pending_crash()
+bool delete_pending_crash()
{
OUStringaUnsentURL = GetUnsentURL();
return ( FileBase::E_None == File::remove( aUnsentURL ) );
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index 5a7bd2d..236ddea 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -29,7 +29,7 @@
#include
namespace {
-static bool loadPng( const OUString & rPath, BitmapEx )
+bool loadPng( const OUString & rPath, BitmapEx )
{
INetURLObject aObj( rPath );
SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ );
@@ -41,7 +41,7 @@ namespace {
else
return false;
}
-static bool tryLoadPng( const OUString& rBaseDir, const OUString& rName,
BitmapEx& rBitmap )
+bool tryLoadPng( const OUString& rBaseDir, const OUString& rName,
BitmapEx& rBitmap )
{
return loadPng( rBaseDir + "/" LIBO_ETC_FOLDER + rName, rBitmap);
}
diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx
b/xmloff/source/transform/XMLFilterRegistration.cxx
index e87ea6a..4b7ce03 100644
--- a/xmloff/source/transform/XMLFilterRegistration.cxx
+++ b/xmloff/source/transform/XMLFilterRegistration.cxx
@@ -43,7 +43,7 @@ namespace
CreateInstance createInstance;
};
-static const ServiceDescriptor* getServiceDescriptors()
+const ServiceDescriptor* getServiceDescriptors()
{
static const ServiceDescriptor aDescriptors[] =
{
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
index 1815770..50dcade 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
@@ -64,7 +64,7 @@ sal_Bool SAL_CALL SanExtensionImpl::isCritical() throw(
::com::sun::star::uno::R
namespace {
// Helper functions from nss/lib/certdb/genname.c
-static int GetNamesLength(CERTGeneralName *names)
+int GetNamesLength(CERTGeneralName *names)
{
int length = 0;
CERTGeneralName *first;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/imgctrl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b91fb8465cdaaff077b9f5c2a73cfc873350126f
Author: Wastack <btom...@gmail.com>
Date: Fri Mar 11 00:39:12 2016 +0100
tdf#97966: Remove 'static' keywords
Change-Id: I67e6076d65b90fb386ab439c5716820a6322af38
Reviewed-on: https://gerrit.libreoffice.org/23130
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index a41f3f4..60d7b79 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -47,7 +47,7 @@ void ImageControl::Resize()
namespace
{
-static Size lcl_calcPaintSize( const Rectangle& _rPaintRect, const Size&
_rBitmapSize )
+Size lcl_calcPaintSize( const Rectangle& _rPaintRect, const Size&
_rBitmapSize )
{
const Size aPaintSize = _rPaintRect.GetSize();
@@ -58,7 +58,7 @@ namespace
return Size( long( _rBitmapSize.Width() * nRatioMin ), long(
_rBitmapSize.Height() * nRatioMin ) );
}
-static Point lcl_centerWithin( const Rectangle& _rArea, const Size&
_rObjectSize )
+Point lcl_centerWithin( const Rectangle& _rArea, const Size& _rObjectSize )
{
Point aPos( _rArea.TopLeft() );
aPos.X() += ( _rArea.GetWidth() - _rObjectSize.Width() ) / 2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/quickselectionengine.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 951917e73cc5d52453830daa47fd30b5fd834bc0
Author: Wastack <btom...@gmail.com>
Date: Fri Mar 11 00:37:08 2016 +0100
tdf#97966: Remove 'static' keywords
Change-Id: I0a3f17d43917d05734980329231ef6e7cadfd58a
Reviewed-on: https://gerrit.libreoffice.org/23129
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/source/control/quickselectionengine.cxx
b/vcl/source/control/quickselectionengine.cxx
index e8d4075..fc7e789 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -56,7 +56,7 @@ namespace vcl
namespace
{
-static void lcl_reset( QuickSelectionEngine_Data& _data )
+void lcl_reset( QuickSelectionEngine_Data& _data )
{
_data.sCurrentSearchString.clear();
_data.aSingleSearchChar.reset();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppuhelper/source tubes/qa ucb/source
cppuhelper/source/exc_thrower.cxx |4 ++--
tubes/qa/test_manager.cxx |2 +-
ucb/source/ucp/expand/ucpexpand.cxx |6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 83452dd0836fe0da96095a322231d837fc31934b
Author: Wastack <btom...@gmail.com>
Date: Fri Mar 11 00:54:07 2016 +0100
tdf#97966 redundant static keywords removed 6
Change-Id: Iaf034f3b2282a973f6503edea41cb3184543fb11
Reviewed-on: https://gerrit.libreoffice.org/23133
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/cppuhelper/source/exc_thrower.cxx
b/cppuhelper/source/exc_thrower.cxx
index 26838d6..7d3e24b 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -67,12 +67,12 @@ extern "C"
{
-static void SAL_CALL ExceptionThrower_acquire_release_nop(
+void SAL_CALL ExceptionThrower_acquire_release_nop(
SAL_UNUSED_PARAMETER uno_Interface * )
{}
-static void SAL_CALL ExceptionThrower_dispatch(
+void SAL_CALL ExceptionThrower_dispatch(
uno_Interface * pUnoI, typelib_TypeDescription const * pMemberType,
void * pReturn, void * pArgs [], uno_Any ** ppException )
{
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index 5abe193..a5c1397 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -64,7 +64,7 @@ class TestCollaboration : public Collaboration
virtual void StartCollaboration( TeleConference* ) {}
};
-static gboolean timed_out( void * )
+gboolean timed_out( void * )
{
CPPUNIT_ASSERT_MESSAGE( "Test took longer than ten seconds!", false);
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx
b/ucb/source/ucp/expand/ucpexpand.cxx
index 9fa5b4d..49673d6 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -115,7 +115,7 @@ void ExpandContentProviderImpl::disposing()
}
-static uno::Reference< uno::XInterface > SAL_CALL create(
+uno::Reference< uno::XInterface > SAL_CALL create(
uno::Reference< uno::XComponentContext > const & xComponentContext )
{
return static_cast< ::cppu::OWeakObject * >(
@@ -123,13 +123,13 @@ static uno::Reference< uno::XInterface > SAL_CALL create(
}
-static OUString SAL_CALL implName()
+OUString SAL_CALL implName()
{
return OUString("com.sun.star.comp.ucb.ExpandContentProvider");
}
-static uno::Sequence< OUString > SAL_CALL supportedServices()
+uno::Sequence< OUString > SAL_CALL supportedServices()
{
OUString names [] = {
OUString("com.sun.star.ucb.ExpandContentProvider"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/gtksys.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7218090791da47aa37292f16bc1fa6f30607a58a
Author: Wastack <btom...@gmail.com>
Date: Tue Mar 8 00:51:02 2016 +0100
tdf#97966 Drop static keywords from two functions inside an unnamed
namespace
Change-Id: I4fca1e813eccfeb5185e7a50aa301e7ad1ee61b5
Reviewed-on: https://gerrit.libreoffice.org/23015
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/vcl/unx/gtk/gtksys.cxx b/vcl/unx/gtk/gtksys.cxx
index 97f2464..ac24256 100644
--- a/vcl/unx/gtk/gtksys.cxx
+++ b/vcl/unx/gtk/gtksys.cxx
@@ -195,7 +195,7 @@ bool GtkSalSystem::IsUnifiedDisplay()
}
namespace {
-static int _fallback_get_primary_monitor (GdkScreen *pScreen)
+int _fallback_get_primary_monitor (GdkScreen *pScreen)
{
// Use monitor name as primacy heuristic
int max = gdk_screen_get_n_monitors (pScreen);
@@ -210,7 +210,7 @@ static int _fallback_get_primary_monitor (GdkScreen
*pScreen)
return 0;
}
-static int _get_primary_monitor (GdkScreen *pScreen)
+int _get_primary_monitor (GdkScreen *pScreen)
{
static int (*get_fn) (GdkScreen *) = nullptr;
#if GTK_CHECK_VERSION(3,0,0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
