[Libreoffice-commits] core.git: package/source
Jan Holesovsky
kendy at collabora.com
Wed Apr 16 09:29:26 PDT 2014
package/source/xstor/ocompinstream.cxx | 62 +++++++-------
package/source/xstor/oseekinstream.cxx | 12 +-
package/source/xstor/owriteablestream.cxx | 117 +++++++++++---------------
package/source/xstor/owriteablestream.hxx | 1
package/source/xstor/xstorage.cxx | 132 +++++++++++++++---------------
5 files changed, 155 insertions(+), 169 deletions(-)
New commits:
commit a60d9aa7ce7d5c77798e7be1efce2afc05d97f85
Author: Jan Holesovsky <kendy at collabora.com>
Date: Wed Apr 16 18:24:58 2014 +0200
package: Turn own logging infra into SAL_INFO to reduce product bin size.
Change-Id: I81b4cf62cb6ae77ea35e7781ef5f464c28b44855
diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx
index 770a0a3..3693364 100644
--- a/package/source/xstor/ocompinstream.cxx
+++ b/package/source/xstor/ocompinstream.cxx
@@ -115,13 +115,13 @@ sal_Int32 SAL_CALL OInputCompStream::readBytes( uno::Sequence< sal_Int8 >& aData
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
if ( !m_xStream.is() )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "No stream!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "No stream!");
throw uno::RuntimeException();
}
@@ -137,13 +137,13 @@ sal_Int32 SAL_CALL OInputCompStream::readSomeBytes( uno::Sequence< sal_Int8 >& a
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
if ( !m_xStream.is() )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "No stream!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "No stream!");
throw uno::RuntimeException();
}
@@ -160,13 +160,13 @@ void SAL_CALL OInputCompStream::skipBytes( sal_Int32 nBytesToSkip )
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
if ( !m_xStream.is() )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "No stream!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "No stream!");
throw uno::RuntimeException();
}
@@ -182,13 +182,13 @@ sal_Int32 SAL_CALL OInputCompStream::available( )
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
if ( !m_xStream.is() )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "No stream!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "No stream!");
throw uno::RuntimeException();
}
@@ -210,7 +210,7 @@ uno::Reference< io::XInputStream > SAL_CALL OInputCompStream::getInputStream()
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -226,7 +226,7 @@ uno::Reference< io::XOutputStream > SAL_CALL OInputCompStream::getOutputStream()
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -239,7 +239,7 @@ void OInputCompStream::InternalDispose()
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -267,7 +267,7 @@ void SAL_CALL OInputCompStream::dispose( )
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -294,7 +294,7 @@ void SAL_CALL OInputCompStream::addEventListener( const uno::Reference< lang::XE
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -310,7 +310,7 @@ void SAL_CALL OInputCompStream::removeEventListener( const uno::Reference< lang:
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -326,7 +326,7 @@ sal_Bool SAL_CALL OInputCompStream::hasByID( const OUString& sID )
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -353,7 +353,7 @@ OUString SAL_CALL OInputCompStream::getTargetByID( const OUString& sID )
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -377,7 +377,7 @@ OUString SAL_CALL OInputCompStream::getTypeByID( const OUString& sID )
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -401,7 +401,7 @@ uno::Sequence< beans::StringPair > SAL_CALL OInputCompStream::getRelationshipByI
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -430,7 +430,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::g
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -464,7 +464,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::g
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -494,7 +494,7 @@ void SAL_CALL OInputCompStream::insertRelationshipByID( const OUString& /*sID*/
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -513,7 +513,7 @@ void SAL_CALL OInputCompStream::removeRelationshipByID( const OUString& /*sID*/
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -532,7 +532,7 @@ void SAL_CALL OInputCompStream::insertRelationships( const uno::Sequence< uno::
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -550,7 +550,7 @@ void SAL_CALL OInputCompStream::clearRelationships()
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -567,7 +567,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OInputCompStream::getProperty
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -586,7 +586,7 @@ void SAL_CALL OInputCompStream::setPropertyValue( const OUString& aPropertyName,
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -611,7 +611,7 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const OUString& aProp )
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -647,7 +647,7 @@ void SAL_CALL OInputCompStream::addPropertyChangeListener(
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -665,7 +665,7 @@ void SAL_CALL OInputCompStream::removePropertyChangeListener(
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -683,7 +683,7 @@ void SAL_CALL OInputCompStream::addVetoableChangeListener(
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -701,7 +701,7 @@ void SAL_CALL OInputCompStream::removeVetoableChangeListener(
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
diff --git a/package/source/xstor/oseekinstream.cxx b/package/source/xstor/oseekinstream.cxx
index 7b16ee0..813ff24 100644
--- a/package/source/xstor/oseekinstream.cxx
+++ b/package/source/xstor/oseekinstream.cxx
@@ -114,13 +114,13 @@ void SAL_CALL OInputSeekStream::seek( sal_Int64 location )
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
if ( !m_xSeekable.is() )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "No seekable!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "No seekable!");
throw uno::RuntimeException();
}
@@ -134,13 +134,13 @@ sal_Int64 SAL_CALL OInputSeekStream::getPosition()
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
if ( !m_xSeekable.is() )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "No seekable!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "No seekable!");
throw uno::RuntimeException();
}
@@ -154,13 +154,13 @@ sal_Int64 SAL_CALL OInputSeekStream::getLength()
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
if ( !m_xSeekable.is() )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "No seekable!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "No seekable!");
throw uno::RuntimeException();
}
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index f2f25f9..8a7baf2 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -78,19 +78,6 @@ bool PackageEncryptionDatasEqual( const ::comphelper::SequenceAsHashMap& aHash1,
return bResult;
}
-void StaticAddLog( const OUString& aMessage )
-{
- try
- {
- uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
- uno::Reference< logging::XSimpleLogRing > xLogRing( logging::DocumentIOLogRing::get(xContext) );
- xLogRing->logString( aMessage );
- }
- catch( const uno::Exception& )
- {
- // No log
- }
-}
} // namespace package
namespace
@@ -108,8 +95,8 @@ void SetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySet >&
}
catch ( const uno::Exception& rException )
{
- ::package::StaticAddLog( rException.Message );
- ::package::StaticAddLog( OSL_LOG_PREFIX "Can't set encryption");
+ SAL_INFO("package.xstor", rException.Message);
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Can't set encryption");
SAL_WARN( "package.xstor", "Can't write encryption related properties!" );
throw io::IOException(); // TODO
}
@@ -126,8 +113,8 @@ uno::Any GetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySe
}
catch ( const uno::Exception& rException )
{
- ::package::StaticAddLog( rException.Message );
- ::package::StaticAddLog( OSL_LOG_PREFIX "Can't get encryption property" );
+ SAL_INFO("package.xstor", rException.Message);
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Can't get encryption property");
SAL_WARN( "package.xstor", "Can't get encryption related properties!" );
throw io::IOException(); // TODO
@@ -210,8 +197,8 @@ sal_Bool KillFile( const OUString& aURL, const uno::Reference< uno::XComponentCo
}
catch( const uno::Exception& rException )
{
- ::package::StaticAddLog( rException.Message );
- ::package::StaticAddLog( OSL_LOG_PREFIX "Quiet exception" );
+ SAL_INFO("package.xstor", rException.Message);
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Quiet exception");
}
return bRet;
@@ -232,8 +219,8 @@ OUString GetNewTempFileURL( const uno::Reference< uno::XComponentContext > xCont
}
catch ( const uno::Exception& rException )
{
- ::package::StaticAddLog( rException.Message );
- ::package::StaticAddLog( OSL_LOG_PREFIX "Quiet exception" );
+ SAL_INFO("package.xstor", rException.Message);
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Quiet exception");
}
if ( aTempURL.isEmpty() )
@@ -1767,7 +1754,7 @@ void OWriteStream::CheckInitOnDemand()
{
if ( !m_pImpl )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -2065,7 +2052,7 @@ sal_Int32 SAL_CALL OWriteStream::readBytes( uno::Sequence< sal_Int8 >& aData, sa
if ( !m_pImpl )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -2087,7 +2074,7 @@ sal_Int32 SAL_CALL OWriteStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData
if ( !m_pImpl )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -2109,7 +2096,7 @@ void SAL_CALL OWriteStream::skipBytes( sal_Int32 nBytesToSkip )
if ( !m_pImpl )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -2130,7 +2117,7 @@ sal_Int32 SAL_CALL OWriteStream::available( )
if ( !m_pImpl )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -2150,7 +2137,7 @@ void SAL_CALL OWriteStream::closeInput( )
if ( !m_pImpl )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -2174,7 +2161,7 @@ uno::Reference< io::XInputStream > SAL_CALL OWriteStream::getInputStream()
if ( !m_pImpl )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -2193,7 +2180,7 @@ uno::Reference< io::XOutputStream > SAL_CALL OWriteStream::getOutputStream()
if ( !m_pImpl )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -2216,7 +2203,7 @@ void SAL_CALL OWriteStream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
if ( !m_pImpl )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -2285,7 +2272,7 @@ void SAL_CALL OWriteStream::flush()
if ( !m_pImpl )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -2333,7 +2320,7 @@ void SAL_CALL OWriteStream::closeOutput()
if ( !m_pImpl )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -2357,7 +2344,7 @@ void SAL_CALL OWriteStream::seek( sal_Int64 location )
if ( !m_pImpl )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -2377,7 +2364,7 @@ sal_Int64 SAL_CALL OWriteStream::getPosition()
if ( !m_pImpl )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -2397,7 +2384,7 @@ sal_Int64 SAL_CALL OWriteStream::getLength()
if ( !m_pImpl )
{
- ::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
+ SAL_INFO("package.xstor", OSL_LOG_PREFIX "Disposed!");
throw lang::DisposedException();
}
@@ -2417,7 +2404,7 @@ void SAL_CALL OWriteStream::truncate()
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2448,7 +2435,7 @@ void SAL_CALL OWriteStream::dispose()
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2511,7 +2498,7 @@ void SAL_CALL OWriteStream::addEventListener(
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2527,7 +2514,7 @@ void SAL_CALL OWriteStream::removeEventListener(
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2545,7 +2532,7 @@ void SAL_CALL OWriteStream::setEncryptionPassword( const OUString& aPass )
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2566,7 +2553,7 @@ void SAL_CALL OWriteStream::removeEncryption()
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2586,7 +2573,7 @@ void SAL_CALL OWriteStream::setEncryptionData( const uno::Sequence< beans::Named
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2621,7 +2608,7 @@ sal_Bool SAL_CALL OWriteStream::hasByID( const OUString& sID )
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2651,7 +2638,7 @@ OUString SAL_CALL OWriteStream::getTargetByID( const OUString& sID )
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2675,7 +2662,7 @@ OUString SAL_CALL OWriteStream::getTypeByID( const OUString& sID )
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2699,7 +2686,7 @@ uno::Sequence< beans::StringPair > SAL_CALL OWriteStream::getRelationshipByID(
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2728,7 +2715,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getRe
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2762,7 +2749,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getAl
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2781,7 +2768,7 @@ void SAL_CALL OWriteStream::insertRelationshipByID( const OUString& sID, const
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2844,7 +2831,7 @@ void SAL_CALL OWriteStream::removeRelationshipByID( const OUString& sID )
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2885,7 +2872,7 @@ void SAL_CALL OWriteStream::insertRelationships( const uno::Sequence< uno::Sequ
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2966,7 +2953,7 @@ void SAL_CALL OWriteStream::clearRelationships()
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -2998,7 +2985,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -3123,7 +3110,7 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const OUString& aProp )
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -3178,7 +3165,7 @@ void SAL_CALL OWriteStream::addPropertyChangeListener(
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -3196,7 +3183,7 @@ void SAL_CALL OWriteStream::removePropertyChangeListener(
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -3214,7 +3201,7 @@ void SAL_CALL OWriteStream::addVetoableChangeListener(
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -3232,7 +3219,7 @@ void SAL_CALL OWriteStream::removeVetoableChangeListener(
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -3252,7 +3239,7 @@ void OWriteStream::BroadcastTransaction( sal_Int8 nMessage )
// no need to lock mutex here for the checking of m_pImpl, and m_pData is alive until the object is destructed
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -3295,7 +3282,7 @@ void SAL_CALL OWriteStream::commit()
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -3309,7 +3296,7 @@ void SAL_CALL OWriteStream::commit()
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -3361,7 +3348,7 @@ void SAL_CALL OWriteStream::revert()
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -3374,7 +3361,7 @@ void SAL_CALL OWriteStream::revert()
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -3424,7 +3411,7 @@ void SAL_CALL OWriteStream::addTransactionListener( const uno::Reference< embed:
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
@@ -3442,7 +3429,7 @@ void SAL_CALL OWriteStream::removeTransactionListener( const uno::Reference< emb
if ( !m_pImpl )
{
- ::package::StaticAddLog( "Disposed!" );
+ SAL_INFO("package.xstor", "Disposed!");
throw lang::DisposedException();
}
diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx
index d06476b..159c2ce 100644
--- a/package/source/xstor/owriteablestream.hxx
+++ b/package/source/xstor/owriteablestream.hxx
@@ -70,7 +70,6 @@ namespace cppu {
}
namespace package {
- void StaticAddLog( const OUString& aMessage );
bool PackageEncryptionDatasEqual( const ::comphelper::SequenceAsHashMap& aHash1, const ::comphelper::SequenceAsHashMap& aHash2 );
}
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 62a81dd..c25e3de 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -1958,7 +1958,7 @@ void SAL_CALL OStorage::InternalDispose( sal_Bool bNotifyImpl )
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -2056,7 +2056,7 @@ void OStorage::BroadcastModifiedIfNecessary()
// no need to lock mutex here for the checking of m_pImpl, and m_pData is alive until the object is destructed
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -2093,7 +2093,7 @@ void OStorage::BroadcastTransaction( sal_Int8 nMessage )
// no need to lock mutex here for the checking of m_pImpl, and m_pData is alive until the object is destructed
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -2349,7 +2349,7 @@ void SAL_CALL OStorage::copyToStorage( const uno::Reference< embed::XStorage >&
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -2416,7 +2416,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -2531,7 +2531,7 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -2684,7 +2684,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const OUStr
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -2780,7 +2780,7 @@ void SAL_CALL OStorage::copyLastCommitTo(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -2846,7 +2846,7 @@ void SAL_CALL OStorage::copyStorageElementLastCommitTo(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!");
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -2938,7 +2938,7 @@ sal_Bool SAL_CALL OStorage::isStreamElement( const OUString& aElementName )
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -3005,7 +3005,7 @@ sal_Bool SAL_CALL OStorage::isStorageElement( const OUString& aElementName )
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -3076,7 +3076,7 @@ void SAL_CALL OStorage::removeElement( const OUString& aElementName )
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -3168,7 +3168,7 @@ void SAL_CALL OStorage::renameElement( const OUString& aElementName, const OUStr
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -3272,7 +3272,7 @@ void SAL_CALL OStorage::copyElementTo( const OUString& aElementName,
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -3373,7 +3373,7 @@ void SAL_CALL OStorage::moveElementTo( const OUString& aElementName,
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -3485,7 +3485,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -3594,7 +3594,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStream(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -3682,7 +3682,7 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getPlainRawStreamElement(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -3789,7 +3789,7 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getRawEncrStreamElement(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -3906,7 +3906,7 @@ void SAL_CALL OStorage::insertRawEncrStreamElement( const OUString& aStreamName,
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4001,7 +4001,7 @@ void SAL_CALL OStorage::commit()
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4065,7 +4065,7 @@ void SAL_CALL OStorage::revert()
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4130,7 +4130,7 @@ void SAL_CALL OStorage::addTransactionListener( const uno::Reference< embed::XTr
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4145,7 +4145,7 @@ void SAL_CALL OStorage::removeTransactionListener( const uno::Reference< embed::
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4165,7 +4165,7 @@ sal_Bool SAL_CALL OStorage::isModified()
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4180,7 +4180,7 @@ void SAL_CALL OStorage::setModified( sal_Bool bModified )
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4206,7 +4206,7 @@ void SAL_CALL OStorage::addModifyListener(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4223,7 +4223,7 @@ void SAL_CALL OStorage::removeModifyListener(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4245,7 +4245,7 @@ uno::Any SAL_CALL OStorage::getByName( const OUString& aName )
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4309,7 +4309,7 @@ uno::Sequence< OUString > SAL_CALL OStorage::getElementNames()
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4345,7 +4345,7 @@ sal_Bool SAL_CALL OStorage::hasByName( const OUString& aName )
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4388,7 +4388,7 @@ uno::Type SAL_CALL OStorage::getElementType()
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4405,7 +4405,7 @@ sal_Bool SAL_CALL OStorage::hasElements()
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4440,7 +4440,7 @@ void SAL_CALL OStorage::dispose()
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4475,7 +4475,7 @@ void SAL_CALL OStorage::addEventListener(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4491,7 +4491,7 @@ void SAL_CALL OStorage::removeEventListener(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4519,7 +4519,7 @@ void SAL_CALL OStorage::removeEncryption()
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4593,7 +4593,7 @@ void SAL_CALL OStorage::setEncryptionData( const uno::Sequence< beans::NamedValu
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4665,7 +4665,7 @@ void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::Nam
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4730,7 +4730,7 @@ uno::Sequence< beans::NamedValue > SAL_CALL OStorage::getEncryptionAlgorithms()
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4794,7 +4794,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OStorage::getPropertySetInfo(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4815,7 +4815,7 @@ void SAL_CALL OStorage::setPropertyValue( const OUString& aPropertyName, const u
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -4922,7 +4922,7 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const OUString& aPropertyName )
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5029,7 +5029,7 @@ void SAL_CALL OStorage::addPropertyChangeListener(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5047,7 +5047,7 @@ void SAL_CALL OStorage::removePropertyChangeListener(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5065,7 +5065,7 @@ void SAL_CALL OStorage::addVetoableChangeListener(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5083,7 +5083,7 @@ void SAL_CALL OStorage::removeVetoableChangeListener(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5102,7 +5102,7 @@ sal_Bool SAL_CALL OStorage::hasByID( const OUString& sID )
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5132,7 +5132,7 @@ OUString SAL_CALL OStorage::getTargetByID( const OUString& sID )
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5156,7 +5156,7 @@ OUString SAL_CALL OStorage::getTypeByID( const OUString& sID )
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5180,7 +5180,7 @@ uno::Sequence< beans::StringPair > SAL_CALL OStorage::getRelationshipByID( cons
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5209,7 +5209,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getRelati
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5244,7 +5244,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getAllRel
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5263,7 +5263,7 @@ void SAL_CALL OStorage::insertRelationshipByID( const OUString& sID, const uno:
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5326,7 +5326,7 @@ void SAL_CALL OStorage::removeRelationshipByID( const OUString& sID )
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5367,7 +5367,7 @@ void SAL_CALL OStorage::insertRelationships( const uno::Sequence< uno::Sequence
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5448,7 +5448,7 @@ void SAL_CALL OStorage::clearRelationships()
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5494,7 +5494,7 @@ void SAL_CALL OStorage::insertStreamElementDirect(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5585,7 +5585,7 @@ void SAL_CALL OStorage::copyElementDirectlyTo(
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5683,7 +5683,7 @@ void SAL_CALL OStorage::writeAndAttachToStream( const uno::Reference< io::XStrea
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5754,7 +5754,7 @@ void SAL_CALL OStorage::attachToURL( const OUString& sURL,
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5838,7 +5838,7 @@ uno::Any SAL_CALL OStorage::getElementPropertyValue( const OUString& aElementNam
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -5939,7 +5939,7 @@ void SAL_CALL OStorage::copyStreamElementData( const OUString& aStreamName, cons
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -6023,7 +6023,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamEle
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -6093,7 +6093,7 @@ void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const OUString& a
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
@@ -6127,7 +6127,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncrypted
if ( !m_pImpl )
{
- ::package::StaticAddLog( THROW_WHERE "Disposed!" );
+ SAL_INFO("package.xstor", THROW_WHERE "Disposed!");
throw lang::DisposedException( THROW_WHERE, uno::Reference< uno::XInterface >() );
}
More information about the Libreoffice-commits
mailing list