|
Lines 688-700
Link Here
|
| 688 |
// TODO: copy encrypted element |
688 |
// TODO: copy encrypted element |
| 689 |
if ( !pElement->m_pStream->IsEncrypted() ) |
689 |
if ( !pElement->m_pStream->IsEncrypted() ) |
| 690 |
{ |
690 |
{ |
| 691 |
<<<<<<< xstorage.cxx |
|
|
| 692 |
uno::Reference< io::XStream > xSubStr = |
691 |
uno::Reference< io::XStream > xSubStr = |
| 693 |
xDest->openStreamElement( pElement->m_aName, |
692 |
xDest->openStreamElement( pElement->m_aName, |
| 694 |
======= |
|
|
| 695 |
uno::Reference< io::XStream > xSubStr = |
| 696 |
xDest->openStreamElement( aName, |
| 697 |
>>>>>>> 1.9 |
| 698 |
embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE ); |
693 |
embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE ); |
| 699 |
OSL_ENSURE( xSubStr.is(), "No destination substream!\n" ); |
694 |
OSL_ENSURE( xSubStr.is(), "No destination substream!\n" ); |
| 700 |
|
695 |
|
|
Lines 702-714
Link Here
|
| 702 |
} |
697 |
} |
| 703 |
else if ( pElement->m_pStream->HasCachedPassword() && pElement->m_pStream->IsModified() ) |
698 |
else if ( pElement->m_pStream->HasCachedPassword() && pElement->m_pStream->IsModified() ) |
| 704 |
{ |
699 |
{ |
| 705 |
<<<<<<< xstorage.cxx |
|
|
| 706 |
uno::Reference< io::XStream > xSubStr = |
700 |
uno::Reference< io::XStream > xSubStr = |
| 707 |
xDest->openEncryptedStreamElement( pElement->m_aName, |
701 |
xDest->openEncryptedStreamElement( pElement->m_aName, |
| 708 |
======= |
|
|
| 709 |
uno::Reference< io::XStream > xSubStr = |
| 710 |
xDest->openEncryptedStreamElement( aName, |
| 711 |
>>>>>>> 1.9 |
| 712 |
embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE, |
702 |
embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE, |
| 713 |
pElement->m_pStream->GetCachedPassword() ); |
703 |
pElement->m_pStream->GetCachedPassword() ); |
| 714 |
OSL_ENSURE( xSubStr.is(), "No destination substream!\n" ); |
704 |
OSL_ENSURE( xSubStr.is(), "No destination substream!\n" ); |
|
Lines 1601-1615
Link Here
|
| 1601 |
|
1591 |
|
| 1602 |
xComponent->addEventListener( uno::Reference< lang::XEventListener >( |
1592 |
xComponent->addEventListener( uno::Reference< lang::XEventListener >( |
| 1603 |
static_cast< ::cppu::OWeakObject* >( m_pData->m_pSubElDispListener ), uno::UNO_QUERY ) ); |
1593 |
static_cast< ::cppu::OWeakObject* >( m_pData->m_pSubElDispListener ), uno::UNO_QUERY ) ); |
| 1604 |
<<<<<<< xstorage.cxx |
|
|
| 1605 |
|
1594 |
|
| 1606 |
sal_Int32 nLength = m_pData->m_aOpenSubComponentsList.getLength(); |
1595 |
sal_Int32 nLength = m_pData->m_aOpenSubComponentsList.getLength(); |
| 1607 |
m_pData->m_aOpenSubComponentsList.realloc( nLength + 1 ); |
1596 |
m_pData->m_aOpenSubComponentsList.realloc( nLength + 1 ); |
| 1608 |
m_pData->m_aOpenSubComponentsList[nLength] = xComponent; |
1597 |
m_pData->m_aOpenSubComponentsList[nLength] = xComponent; |
| 1609 |
======= |
|
|
| 1610 |
|
1598 |
|
| 1611 |
m_pData->m_aOpenSubComponentsList.push_back( xComponent ); |
1599 |
m_pData->m_aOpenSubComponentsList.push_back( xComponent ); |
| 1612 |
>>>>>>> 1.9 |
|
|
| 1613 |
} |
1600 |
} |
| 1614 |
|
1601 |
|
| 1615 |
//____________________________________________________________________________________________________ |
1602 |
//____________________________________________________________________________________________________ |