diff options
Diffstat (limited to 'connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx')
| -rwxr-xr-x[-rw-r--r--] | connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 1e3f80546d74..96ab611142c0 100644..100755 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -462,7 +463,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, Ru checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); - if(m_aRowsIter == m_aRows.end() || !(*m_aRowsIter)[m_nColPos].isValid()) + if(m_aRowsIter == m_aRows.end() || !(*m_aRowsIter)[m_nColPos].is()) return sal_True; return (*m_aRowsIter)[m_nColPos]->getValue().isNull(); @@ -641,7 +642,7 @@ const ORowSetValue& ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex) checkIndex(columnIndex ); m_nColPos = columnIndex; - if(m_aRowsIter != m_aRows.end() && (*m_aRowsIter)[columnIndex].isValid()) + if(m_aRowsIter != m_aRows.end() && (*m_aRowsIter)[columnIndex].is()) return *(*m_aRowsIter)[columnIndex]; return m_aEmptyValue; } @@ -676,55 +677,55 @@ ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getBasicValue() // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getSelectValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("SELECT")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT"))); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getInsertValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("INSERT")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT"))); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDeleteValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DELETE")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DELETE"))); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getUpdateValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("UPDATE")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UPDATE"))); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getCreateValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("CREATE")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATE"))); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getReadValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("READ")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("READ"))); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getAlterValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("ALTER")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ALTER"))); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDropValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DROP")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DROP"))); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getQuoteValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("'")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"))); return aValueRef; } // ----------------------------------------------------------------------------- @@ -834,7 +835,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA Sequence< ::rtl::OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ResultSet"); + aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet")); return aSNS; } //------------------------------------------------------------------ @@ -906,3 +907,5 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* implNam } } // extern "C" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |