diff options
-rw-r--r-- | store/source/storbase.hxx | 28 | ||||
-rw-r--r-- | svl/source/misc/strmadpt.cxx | 18 | ||||
-rw-r--r-- | svl/source/numbers/zforlist.cxx | 5 |
3 files changed, 9 insertions, 42 deletions
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx index 05bc66e6581e..db98c3e6e1c9 100644 --- a/store/source/storbase.hxx +++ b/store/source/storbase.hxx @@ -261,19 +261,7 @@ struct OStorePageDescriptor (m_nSize == rhs.m_nSize) ); } - bool operator<= (const OStorePageDescriptor & rhs) const - { - return ((m_nAddr == rhs.m_nAddr ) && - (store::ntohs(m_nSize) <= store::ntohs(rhs.m_nSize)) ); - } - bool operator< (const OStorePageDescriptor & rhs) const - { - if (m_nAddr == rhs.m_nAddr) - return (store::ntohs(m_nSize) < store::ntohs(rhs.m_nSize)); - else - return (store::ntohl(m_nAddr) < store::ntohl(rhs.m_nAddr)); - } }; /*======================================================================== @@ -368,11 +356,6 @@ struct OStorePageLink return (m_nAddr == rhs.m_nAddr); } - bool operator< (const OStorePageLink& rhs) const - { - return (store::ntohl(m_nAddr) < store::ntohl(rhs.m_nAddr)); - } - /** Operation. */ sal_uInt32 location() const @@ -599,17 +582,6 @@ public: OSL_PRECOND(m_pagedata != nullptr, "store::PageHolder::operator->(): Null pointer"); return m_pagedata; } - - PageData & operator*() - { - OSL_PRECOND(m_pagedata != nullptr, "store::PageHolder::operator*(): Null pointer"); - return *m_pagedata; - } - PageData const & operator*() const - { - OSL_PRECOND(m_pagedata != nullptr, "store::PageHolder::operator*(): Null pointer"); - return *m_pagedata; - } }; /*======================================================================== diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index e0157a1406b1..c4290e2fc262 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -68,7 +68,7 @@ private: sal_uInt32 m_nPages; bool m_bEOF; - bool remove(Page * pPage); + void remove(Page * pPage); public: inline SvDataPipe_Impl(sal_uInt32 nThePageSize = 1000, @@ -84,7 +84,7 @@ public: void clearReadBuffer() { m_pReadBuffer = nullptr; } - sal_uInt32 write(sal_Int8 const * pBuffer, sal_uInt32 nSize); + void write(sal_Int8 const * pBuffer, sal_uInt32 nSize); void setEOF() { m_bEOF = true; } @@ -533,7 +533,7 @@ SvOutputStream::~SvOutputStream() // SvDataPipe_Impl -bool SvDataPipe_Impl::remove(Page * pPage) +void SvDataPipe_Impl::remove(Page * pPage) { if ( pPage != m_pFirstPage || @@ -544,20 +544,18 @@ bool SvDataPipe_Impl::remove(Page * pPage) ) ) { - return false; + return; } m_pFirstPage = m_pFirstPage->m_pNext; if (m_nPages <= m_nMinPages) - return true; + return; pPage->m_pPrev->m_pNext = pPage->m_pNext; pPage->m_pNext->m_pPrev = pPage->m_pPrev; rtl_freeMemory(pPage); --m_nPages; - - return true; } SvDataPipe_Impl::~SvDataPipe_Impl() @@ -611,10 +609,10 @@ sal_uInt32 SvDataPipe_Impl::read() return nSize - nRemain; } -sal_uInt32 SvDataPipe_Impl::write(sal_Int8 const * pBuffer, sal_uInt32 nSize) +void SvDataPipe_Impl::write(sal_Int8 const * pBuffer, sal_uInt32 nSize) { if (nSize == 0) - return 0; + return; if (m_pWritePage == nullptr) { @@ -705,8 +703,6 @@ sal_uInt32 SvDataPipe_Impl::write(sal_Int8 const * pBuffer, sal_uInt32 nSize) m_pWritePage->m_pRead = m_pWritePage->m_aBuffer; m_pWritePage->m_pEnd = m_pWritePage->m_aBuffer; } - - return nSize - nRemain; } SvDataPipe_Impl::SeekResult SvDataPipe_Impl::setReadPosition(sal_uInt32 diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 1326c9a9b571..4b2646e4f81e 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -166,7 +166,7 @@ public: void Insert( SvNumberFormatter* pThis ) { aFormatters.push_back( pThis ); } - SvNumberFormatter* Remove( SvNumberFormatter* pThis ); + void Remove( SvNumberFormatter* pThis ); size_t Count() { return aFormatters.size(); } @@ -187,7 +187,7 @@ SvNumberFormatterRegistry_Impl::~SvNumberFormatterRegistry_Impl() } -SvNumberFormatter* SvNumberFormatterRegistry_Impl::Remove( SvNumberFormatter* pThis ) +void SvNumberFormatterRegistry_Impl::Remove( SvNumberFormatter* pThis ) { for (SvNumberFormatterList_impl::iterator it = aFormatters.begin(); it != aFormatters.end(); ++it) @@ -198,7 +198,6 @@ SvNumberFormatter* SvNumberFormatterRegistry_Impl::Remove( SvNumberFormatter* pT break; } } - return pThis; } void SvNumberFormatterRegistry_Impl::ConfigurationChanged( utl::ConfigurationBroadcaster*, |