summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-08-04 09:03:40 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-08-04 09:03:40 +0000
commit85a58ffc9f393569bf31cc54a5b019537f0c5bc8 (patch)
tree2c36b4ddf8a4a5f55ae848c5f608b5a557c36775 /package
parentdbc31f5d73cb0f8c746a39edcf8ec7ea74a25b21 (diff)
#i10000#: fix outstanding conflicts
Diffstat (limited to 'package')
-rw-r--r--package/source/xstor/xstorage.cxx21
1 files changed, 2 insertions, 19 deletions
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index d7a37d92e9e5..ad71b777e64e 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xstorage.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: hr $ $Date: 2004-08-02 14:08:56 $
+ * last change: $Author: hr $ $Date: 2004-08-04 10:03:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -688,13 +688,8 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
// TODO: copy encrypted element
if ( !pElement->m_pStream->IsEncrypted() )
{
-<<<<<<< xstorage.cxx
- uno::Reference< io::XStream > xSubStr =
- xDest->openStreamElement( pElement->m_aName,
-=======
uno::Reference< io::XStream > xSubStr =
xDest->openStreamElement( aName,
->>>>>>> 1.9
embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
OSL_ENSURE( xSubStr.is(), "No destination substream!\n" );
@@ -702,13 +697,8 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
}
else if ( pElement->m_pStream->HasCachedPassword() && pElement->m_pStream->IsModified() )
{
-<<<<<<< xstorage.cxx
- uno::Reference< io::XStream > xSubStr =
- xDest->openEncryptedStreamElement( pElement->m_aName,
-=======
uno::Reference< io::XStream > xSubStr =
xDest->openEncryptedStreamElement( aName,
->>>>>>> 1.9
embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE,
pElement->m_pStream->GetCachedPassword() );
OSL_ENSURE( xSubStr.is(), "No destination substream!\n" );
@@ -1601,15 +1591,8 @@ void OStorage::MakeLinkToSubComponent_Impl( const uno::Reference< lang::XCompone
xComponent->addEventListener( uno::Reference< lang::XEventListener >(
static_cast< ::cppu::OWeakObject* >( m_pData->m_pSubElDispListener ), uno::UNO_QUERY ) );
-<<<<<<< xstorage.cxx
-
- sal_Int32 nLength = m_pData->m_aOpenSubComponentsList.getLength();
- m_pData->m_aOpenSubComponentsList.realloc( nLength + 1 );
- m_pData->m_aOpenSubComponentsList[nLength] = xComponent;
-=======
m_pData->m_aOpenSubComponentsList.push_back( xComponent );
->>>>>>> 1.9
}
//____________________________________________________________________________________________________