mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let's apply the same for these

Browse Source 
Change-Id: Icd0f4ecee7d3d633f7a41e479729688829b4cf9d
This commit is contained in:
Julien Nabet 2013-12-14 13:03:24 +01:00
parent 2531d16dec
commit 0d0e40bd21
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
View File

@ -865,7 +865,7 @@ void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const OUString&
aPKN = OUStringToOString(tableNamePattern,m_nTextEncoding);
const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL,
*pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL,
*pPKO = pSchemaPat && !pSchemaPat->isEmpty() && !aPKO.isEmpty() ? aPKO.getStr() : NULL,
*pPKN = aPKN.getStr();
@ -965,7 +965,7 @@ void ODatabaseMetaDataResultSet::openColumnPrivileges( const Any& catalog, cons
aCOL = OUStringToOString(columnNamePattern,m_nTextEncoding);
const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL,
*pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL,
*pPKO = pSchemaPat && !pSchemaPat->isEmpty() && !aPKO.isEmpty() ? aPKO.getStr() : NULL,
*pPKN = aPKN.getStr(),
*pCOL = aCOL.getStr();
@ -1067,7 +1067,7 @@ void ODatabaseMetaDataResultSet::openProcedureColumns( const Any& catalog,
aCOL = OUStringToOString(columnNamePattern,m_nTextEncoding);
const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL,
*pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL,
*pPKO = pSchemaPat && !pSchemaPat->isEmpty() && !aPKO.isEmpty() ? aPKO.getStr() : NULL,
*pPKN = aPKN.getStr(),
*pCOL = aCOL.getStr();
@ -1101,7 +1101,7 @@ void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const OUStri
aPKN = OUStringToOString(procedureNamePattern,m_nTextEncoding);
const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL,
*pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL,
*pPKO = pSchemaPat && !pSchemaPat->isEmpty() && !aPKO.isEmpty() ? aPKO.getStr() : NULL,
*pPKN = aPKN.getStr();
@ -1144,7 +1144,7 @@ void ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any&
aPKN = OUStringToOString(table,m_nTextEncoding);
const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL,
*pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL,
*pPKO = pSchemaPat && !pSchemaPat->isEmpty() && !aPKO.isEmpty() ? aPKO.getStr() : NULL,
*pPKN = aPKN.getStr();
@ -1231,7 +1231,7 @@ void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const OUStr
aPKO = OUStringToOString(schema,m_nTextEncoding);
const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL,
*pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL,
*pPKO = pSchemaPat && !pSchemaPat->isEmpty() && !aPKO.isEmpty() ? aPKO.getStr() : NULL,
*pPKN = (aPKN = OUStringToOString(table,m_nTextEncoding)).getStr();
@ -1260,7 +1260,7 @@ void ODatabaseMetaDataResultSet::openTablePrivileges(const Any& catalog, const O
aPKO = OUStringToOString(schemaPattern,m_nTextEncoding);
const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL,
*pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL,
*pPKO = pSchemaPat && !pSchemaPat->isEmpty() && !aPKO.isEmpty() ? aPKO.getStr() : NULL,
*pPKN = (aPKN = OUStringToOString(tableNamePattern,m_nTextEncoding)).getStr();
@ -1290,7 +1290,7 @@ void ODatabaseMetaDataResultSet::openIndexInfo( const Any& catalog, const OUStri
aPKO = OUStringToOString(schema,m_nTextEncoding);
const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL,
*pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL,
*pPKO = pSchemaPat && !pSchemaPat->isEmpty() && !aPKO.isEmpty() ? aPKO.getStr() : NULL,
*pPKN = (aPKN = OUStringToOString(table,m_nTextEncoding)).getStr();