[Libreoffice-commits] .: Branch 'integration/dev300_m98' - package/source

[Jan Holesovsky]

 package/source/xstor/owriteablestream.hxx |    1 +
 package/source/xstor/xstorage.cxx         |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit a293b92aeb43e374aee53f86f227c1e8e1c15d00
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Mar 4 17:25:42 2011 +0100

    Fix build of 'package'.

diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx
index ad155cd..c844d74 100644
--- a/package/source/xstor/owriteablestream.hxx
+++ b/package/source/xstor/owriteablestream.hxx
@@ -204,6 +204,7 @@ public:
     sal_Bool HasCachedEncryptionData() { return m_bHasCachedEncryptionData; }
     ::comphelper::SequenceAsHashMap& GetCachedEncryptionData() { return m_aEncryptionData; }
 
+    sal_Bool IsModified() const { return m_bHasDataToFlush || m_bFlushed; }
 
     sal_Bool IsEncrypted();
     void SetDecrypted();
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index b9f0253..f833e55 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -3378,7 +3378,7 @@ void SAL_CALL OStorage::copyElementTo(	const ::rtl::OUString& aElementName,
         if ( !pElement )
             throw container::NoSuchElementException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
-        uno::Reference< XNameAccess > xNameAccess( xDest, uno::UNO_QUERY );
+        uno::Reference< container::XNameAccess > xNameAccess( xDest, uno::UNO_QUERY );
         if ( !xNameAccess.is() )
             throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
@@ -3485,7 +3485,7 @@ void SAL_CALL OStorage::moveElementTo(	const ::rtl::OUString& aElementName,
         if ( !pElement )
             throw container::NoSuchElementException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); //???
 
-        uno::Reference< XNameAccess > xNameAccess( xDest, uno::UNO_QUERY );
+        uno::Reference< container::XNameAccess > xNameAccess( xDest, uno::UNO_QUERY );
         if ( !xNameAccess.is() )
             throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
@@ -5652,7 +5652,7 @@ void SAL_CALL OStorage::copyElementDirectlyTo(
         if ( !pElement )
             throw container::NoSuchElementException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
-        uno::Reference< XNameAccess > xNameAccess( xDest, uno::UNO_QUERY );
+        uno::Reference< container::XNameAccess > xNameAccess( xDest, uno::UNO_QUERY );
         if ( !xNameAccess.is() )
             throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );