diff options
-rw-r--r-- | connectivity/inc/connectivity/sqlerror.hxx | 14 | ||||
-rw-r--r-- | connectivity/source/commontools/sqlerror.cxx | 6 | ||||
-rwxr-xr-x | unusedcode.easy | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMapHelper.cxx | 14 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMapHelper.hxx | 4 |
5 files changed, 19 insertions, 21 deletions
diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx index 0a3cce96b6d0..9cfaffc62e1e 100644 --- a/connectivity/inc/connectivity/sqlerror.hxx +++ b/connectivity/inc/connectivity/sqlerror.hxx @@ -126,19 +126,9 @@ namespace connectivity const ParamValue& _rParamValue3 = ParamValue() ) const; - /** returns the SQLState associated with a given error condition - - @see getErrorMessage - @see getErrorCode - @see ::com::sun::star::sdb::ErrorCondition - @see ::com::sun::star::sdbc::SQLException::SQLState - */ - ::rtl::OUString getSQLState( const ErrorCondition _eCondition ) const; - /** returns the error code associated with a given error condition @see getErrorMessage - @see getSQLState @see ::com::sun::star::sdb::ErrorCondition @see ::com::sun::star::sdbc::SQLException::ErrorCode */ @@ -187,7 +177,6 @@ namespace connectivity @see getErrorMessage @see getErrorCode - @see getSQLState */ void raiseException( const ErrorCondition _eCondition, @@ -226,7 +215,6 @@ namespace connectivity @see getErrorMessage @see getErrorCode - @see getSQLState */ void raiseException( const ErrorCondition _eCondition, @@ -270,7 +258,6 @@ namespace connectivity @see getErrorMessage @see getErrorCode - @see getSQLState */ void raiseTypedException( const ErrorCondition _eCondition, @@ -308,7 +295,6 @@ namespace connectivity @see getErrorMessage @see getErrorCode - @see getSQLState */ ::com::sun::star::sdbc::SQLException getSQLException( diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx index 9dcf56d970aa..90cbd97c9bf2 100644 --- a/connectivity/source/commontools/sqlerror.cxx +++ b/connectivity/source/commontools/sqlerror.cxx @@ -309,12 +309,6 @@ namespace connectivity } //-------------------------------------------------------------------- - ::rtl::OUString SQLError::getSQLState( const ErrorCondition _eCondition ) const - { - return m_pImpl->getSQLState( _eCondition ); - } - - //-------------------------------------------------------------------- ErrorCode SQLError::getErrorCode( const ErrorCondition _eCondition ) { return SQLError_Impl::getErrorCode( _eCondition ); diff --git a/unusedcode.easy b/unusedcode.easy index 74d062c19b38..358babf274df 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -64,6 +64,7 @@ SrchAttrItemList::Replace(SearchAttrItem const&, unsigned short) SrchAttrItemList::Replace(SearchAttrItem const*, unsigned short, unsigned short) SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char (*)(SearchAttrItem const&, void*), void*) StgCache::Pos2Page(int) +String::CreateFromAscii(char const*, unsigned short) String::String(rtl::OString const&, unsigned short, unsigned int) String::String(unsigned short const*) String::String(unsigned short const*, unsigned short) @@ -320,7 +321,6 @@ comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<co comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const connectivity::OKeyValue::OKeyValue() -connectivity::SQLError::getSQLState(int) const connectivity::file::OStatement_Base::reset() connectivity::mozab::MQueryHelper::next() connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char) diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx index 50e82f3f93b6..5021922bd658 100644 --- a/writerfilter/source/dmapper/PropertyMapHelper.cxx +++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx @@ -96,6 +96,20 @@ void lcl_DumpPropertyValueSeq(const TagLogger::Pointer_t pLogger, PropertyValueS pLogger->endElement(); } +void lcl_DumpPropertyValueSeqSeq(const TagLogger::Pointer_t pLogger, PropertyValueSeqSeq_t rPropValSeqSeq) +{ + pLogger->startElement("PropertyValueSeq"); + + PropertyValueSeq_t * pValues = rPropValSeqSeq.getArray(); + + for (sal_Int32 n = 0; n < rPropValSeqSeq.getLength(); ++n) + { + lcl_DumpPropertyValueSeq(pLogger, pValues[n]); + } + + pLogger->endElement(); +} + } } #endif // OSL_DEBUG_LEVEL > 1 diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx index 13c0f34d05d6..43190dcf3295 100644 --- a/writerfilter/source/dmapper/PropertyMapHelper.hxx +++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx @@ -35,6 +35,10 @@ typedef uno::Sequence<beans::PropertyValues> PropertyValueSeq_t; void lcl_DumpPropertyValueSeq(const TagLogger::Pointer_t pLogger, PropertyValueSeq_t & rPropValSeq); +typedef uno::Sequence<PropertyValueSeq_t> PropertyValueSeqSeq_t; +void lcl_DumpPropertyValueSeqSeq(const TagLogger::Pointer_t pLogger, + PropertyValueSeqSeq_t & rPropValSeqSeq); +} } #endif // OSL_DEBUG_LEVEL > 1 |