diff options
| -rw-r--r-- | embeddedobj/source/commonembedding/embedobj.cxx | 1 | ||||
| -rw-r--r-- | sw/source/core/ole/ndole.cxx | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index 9e24276351e7..4be6cc99d023 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -421,7 +421,6 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState ) uno::Exception, uno::RuntimeException, std::exception ) { - uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ), uno::UNO_QUERY); { ::osl::ResettableMutexGuard aGuard( m_aMutex ); if ( m_bDisposed ) diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 649d0b74744a..d69ddd98c745 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -972,18 +972,16 @@ void SwOLELRUCache::InsertObj( SwOLEObj& rObj ) } if (it == m_OleObjects.end()) { - m_OleObjects.push_front( pObj ); - // try to remove objects if necessary - // (of course not the freshly inserted one at nPos=0) sal_Int32 nCount = m_OleObjects.size(); sal_Int32 nPos = nCount-1; - while (nPos && nCount > m_nLRU_InitSize) + while (nPos >= 0 && nCount >= m_nLRU_InitSize) { pObj = m_OleObjects[ nPos-- ]; if ( pObj->UnloadObject() ) nCount--; } + m_OleObjects.push_front(&rObj); } } |