Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4128

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/4128/1

fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO

- replaced RTL_CONTEXT_ with SAL_INFO
- replace OSL_* with SAL_*

Change-Id: I9a7cce0d3abef42c9d9d0ad56609d94d504854cb
---
M linguistic/source/lngsvcmgr.cxx
M package/source/xstor/owriteablestream.cxx
M package/source/xstor/xstorage.cxx
M sd/source/filter/xml/sdxmlwrp.cxx
M sfx2/source/appl/app.cxx
M sfx2/source/appl/appinit.cxx
M sfx2/source/bastyp/fltfnc.cxx
M sfx2/source/doc/docfile.cxx
M sfx2/source/doc/objstor.cxx
M sfx2/source/view/frmload.cxx
M slideshow/source/engine/shapes/backgroundshape.cxx
M slideshow/source/engine/shapes/drawshape.cxx
M slideshow/source/engine/shapes/drawshapesubsetting.cxx
M slideshow/source/engine/shapes/viewbackgroundshape.cxx
14 files changed, 256 insertions(+), 304 deletions(-)



diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 2adeb65..b5a8dd1 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -35,7 +35,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <cppuhelper/factory.hxx>
 #include <comphelper/extract.hxx>
-#include <rtl/logfile.hxx>
 
 #include <boost/checked_delete.hpp>
 
@@ -107,7 +106,7 @@
             }
             catch (uno::Exception &)
             {
-                DBG_ASSERT( 0, "createInstanceWithArguments failed" );
+                SAL_WARN( "linguistic", "createInstanceWithArguments failed" );
             }
 
             if (xSuppLoc.is())
@@ -126,7 +125,7 @@
             }
             else
             {
-                DBG_ASSERT( 0, "interface not supported by service" );
+                SAL_WARN( "linguistic", "interface not supported by service" );
             }
         }
 
@@ -628,13 +627,13 @@
             Sequence< Any > aValues( rCfg.GetProperties( aNames ) );
             if (aValues.getLength())
             {
-                OSL_ENSURE( aValues.getLength() == 1, "unexpected length of sequence" );
+                SAL_WARN_IF( aValues.getLength() <= 1, "linguistic", "unexpected length of 
sequence" );
                 Sequence< OUString > aSvcImplNames;
                 if (aValues.getConstArray()[0] >>= aSvcImplNames)
                     aRes = aSvcImplNames;
                 else
                 {
-                    OSL_FAIL( "type mismatch" );
+                    SAL_WARN( "linguistic", "type mismatch" );
                 }
             }
         }
@@ -820,7 +819,7 @@
                 if (!bRes)
                 {
 #if OSL_DEBUG_LEVEL > 1
-                    OSL_FAIL( "failed to set new configuration values" );
+                    SAL_WARN( "linguistic", "failed to set new configuration values" );
 #endif
                 }
             }
@@ -861,7 +860,7 @@
         OUString aKeyText;
         if (nKeyStart != -1)
             aKeyText = rName.copy( nKeyStart + 1 );
-        DBG_ASSERT( !aKeyText.isEmpty(), "unexpected key (lang::Locale) string" );
+        SAL_WARN_IF( aKeyText.isEmpty(), "linguistic", "unexpected key (lang::Locale) string" );
         if (rName.startsWith( aSpellCheckerList ))
         {
             // delete old cached data, needs to be acquired new on demand
@@ -967,7 +966,7 @@
         }
         else
         {
-            DBG_ASSERT( 0, "nofified for unexpected property" );
+            SAL_WARN( "linguistic", "nofified for unexpected property" );
         }
     }
 }
@@ -1017,13 +1016,13 @@
         catch (const uno::Exception &)
         {
         }
-        DBG_ASSERT( xGCI.is(), "instantiating grammar checking iterator failed" );
+        SAL_WARN_IF( !xGCI.is(), "linguistic", "instantiating grammar checking iterator failed" );
 
         if (xGCI.is())
         {
             pGrammarDsp    = dynamic_cast< GrammarCheckingIterator * >(xGCI.get());
             xGrammarDsp    = xGCI;
-            DBG_ASSERT( pGrammarDsp, "failed to get implementation" );
+            SAL_WARN_IF( pGrammarDsp == NULL, "linguistic", "failed to get implementation" );
             if (bSetSvcList)
                 SetCfgServiceLists( *pGrammarDsp );
         }
@@ -1085,7 +1084,7 @@
                     }
                     catch (const uno::Exception &)
                     {
-                        DBG_ASSERT( 0, "createInstance failed" );
+                        SAL_WARN( "linguistic", "createInstance failed" );
                     }
                 }
 
@@ -1096,9 +1095,9 @@
                     uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
                     if (xInfo.is())
                         aImplName = xInfo->getImplementationName();
-                    DBG_ASSERT( !aImplName.isEmpty(), "empty implementation name" );
+                    SAL_WARN_IF( aImplName.isEmpty(), "linguistic", "empty implementation name" );
                     uno::Reference< linguistic2::XSupportedLocales > xSuppLoc( xSvc, 
uno::UNO_QUERY );
-                    DBG_ASSERT( xSuppLoc.is(), "interfaces not supported" );
+                    SAL_WARN_IF( !xSuppLoc.is(), "linguistic", "interfaces not supported" );
                     if (xSuppLoc.is()) {
                         uno::Sequence<lang::Locale> aLocaleSequence(xSuppLoc->getLocales());
                         aLanguages = LocaleSeqToLangSeq( aLocaleSequence );
@@ -1142,7 +1141,7 @@
                     }
                     catch (const uno::Exception &)
                     {
-                        DBG_ASSERT( 0, "createInstance failed" );
+                        SAL_WARN( "linguistic", "createInstance failed" );
                     }
                 }
 
@@ -1153,9 +1152,9 @@
                     uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
                     if (xInfo.is())
                         aImplName = xInfo->getImplementationName();
-                    DBG_ASSERT( !aImplName.isEmpty(),"empty implementation name" );
+                    SAL_WARN_IF( aImplName.isEmpty(), "linguistic", "empty implementation name" );
                     uno::Reference< linguistic2::XSupportedLocales > xSuppLoc( xSvc, 
uno::UNO_QUERY );
-                    DBG_ASSERT( xSuppLoc.is(), "interfaces not supported" );
+                    SAL_WARN_IF( !xSuppLoc.is(), "linguistic", "interfaces not supported" );
                     if (xSuppLoc.is())
                     {
                         uno::Sequence<lang::Locale> aLocaleSequence(xSuppLoc->getLocales());
@@ -1199,7 +1198,7 @@
                     }
                     catch (const uno::Exception &)
                     {
-                        DBG_ASSERT( 0, "createInstance failed" );
+                        SAL_WARN( "linguistic", "createInstance failed" );
                     }
                 }
                 if (xSvc.is())
@@ -1209,9 +1208,9 @@
                     uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
                     if (xInfo.is())
                         aImplName = xInfo->getImplementationName();
-                    DBG_ASSERT( !aImplName.isEmpty(), "empty implementation name" );
+                    SAL_WARN_IF( aImplName.isEmpty(), "linguistic", "empty implementation name" );
                     uno::Reference< linguistic2::XSupportedLocales > xSuppLoc( xSvc, 
uno::UNO_QUERY );
-                    DBG_ASSERT( xSuppLoc.is(), "interfaces not supported" );
+                    SAL_WARN_IF( !xSuppLoc.is(), "linguistic", "interfaces not supported" );
                     if (xSuppLoc.is())
                     {
                         uno::Sequence<lang::Locale> aLocaleSequence(xSuppLoc->getLocales());
@@ -1255,7 +1254,7 @@
                     }
                     catch (const uno::Exception &)
                     {
-                        DBG_ASSERT( 0, "createInstance failed" );
+                       SAL_WARN( "linguistic", "createInstance failed" );
                     }
                 }
                 if (xSvc.is())
@@ -1265,9 +1264,9 @@
                     uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
                     if (xInfo.is())
                         aImplName = xInfo->getImplementationName();
-                    DBG_ASSERT( !aImplName.isEmpty(), "empty implementation name" );
+                    SAL_WARN_IF( aImplName.isEmpty(), "linguistic", "empty implementation name" );
                     uno::Reference< linguistic2::XSupportedLocales > xSuppLoc( xSvc, 
uno::UNO_QUERY );
-                    DBG_ASSERT( xSuppLoc.is(), "interfaces not supported" );
+                    SAL_WARN_IF( !xSuppLoc.is(), "linguistic", "interfaces not supported" );
                     if (xSuppLoc.is())
                     {
                         uno::Sequence<lang::Locale> aLocaleSequence(xSuppLoc->getLocales());
@@ -1284,7 +1283,7 @@
 
 void LngSvcMgr::SetCfgServiceLists( SpellCheckerDispatcher &rSpellDsp )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SetCfgServiceLists - Spell" );
+    SAL_INFO( "linguistic", "linguistic: LngSvcMgr::SetCfgServiceLists - Spell" );
 
     OUString aNode("ServiceManager/SpellCheckerList");
     uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
@@ -1322,7 +1321,7 @@
 
 void LngSvcMgr::SetCfgServiceLists( GrammarCheckingIterator &rGrammarDsp )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SetCfgServiceLists - Grammar" );
+    SAL_INFO( "linguistic", "linguistic: LngSvcMgr::SetCfgServiceLists - Grammar" );
 
     OUString aNode("ServiceManager/GrammarCheckerList");
     uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
@@ -1364,7 +1363,7 @@
 
 void LngSvcMgr::SetCfgServiceLists( HyphenatorDispatcher &rHyphDsp )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SetCfgServiceLists - Hyph" );
+    SAL_INFO( "linguistic", "linguistic: LngSvcMgr::SetCfgServiceLists - Hyph" );
 
     OUString aNode("ServiceManager/HyphenatorList");
     uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
@@ -1406,7 +1405,7 @@
 
 void LngSvcMgr::SetCfgServiceLists( ThesaurusDispatcher &rThesDsp )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SetCfgServiceLists - Thes" );
+    SAL_INFO( "linguistic", "linguistic: LngSvcMgr::SetCfgServiceLists - Thes" );
 
     OUString aNode("ServiceManager/ThesaurusList");
     uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
@@ -1659,7 +1658,7 @@
             const uno::Sequence< OUString >& rServiceImplNames )
         throw(uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::setConfiguredServices" );
+    SAL_INFO( "linguistic", "linguistic: LngSvcMgr::setConfiguredServices" );
 
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -1736,7 +1735,7 @@
 
 sal_Bool LngSvcMgr::SaveCfgSvcs( const String &rServiceName )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SaveCfgSvcs" );
+    SAL_INFO( "linguistic", "linguistic: LngSvcMgr::SaveCfgSvcs" );
 
     sal_Bool bRes = sal_False;
 
@@ -1793,7 +1792,7 @@
             pNodeName = "ServiceManager/ThesaurusList";
         else
         {
-            DBG_ASSERT( 0, "node name missing" );
+            SAL_WARN( "linguistic", "node name missing" );
         }
         OUString aNodeName( OUString::createFromAscii(pNodeName) );
 
@@ -1825,7 +1824,7 @@
             pValue++;
         }
         {
-        RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SaveCfgSvcs - ReplaceSetProperties" );
+        SAL_INFO( "linguistic", "linguistic: LngSvcMgr::SaveCfgSvcs - ReplaceSetProperties" );
         // change, add new or replace existing entries.
         bRes |= /*aCfg.*/ReplaceSetProperties( aNodeName, aValues );
         }
@@ -1850,7 +1849,7 @@
             for (sal_Int32 j = 0;  j < nSvcs;  ++j)
             {
                 OUString aImplName( pSvcName[j] );
-                DBG_ASSERT( !aImplName.isEmpty(), "service impl-name missing" );
+                SAL_WARN_IF( aImplName.isEmpty(), "linguistic", "service impl-name missing" );
             }
         }
 #endif
@@ -1886,7 +1885,7 @@
         }
         else
         {
-            DBG_ASSERT( 0, "GetLangSvc: unexpected type encountered" );
+            SAL_WARN( "linguistic", "GetLangSvc: unexpected type encountered" );
         }
     }
 
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index 6b8d15f..bfb4d25 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -40,7 +40,6 @@
 #include <comphelper/ofopxmlhelper.hxx>
 
 #include <rtl/digest.h>
-#include <rtl/logfile.hxx>
 #include <rtl/instance.hxx>
 
 #include <PackageConstants.hxx>
@@ -104,7 +103,7 @@
 void SetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySet >& xPropertySet,
                                     const uno::Sequence< beans::NamedValue >& aKey )
 {
-    OSL_ENSURE( xPropertySet.is(), "No property set is provided!\n" );
+    SAL_WARN_IF( !xPropertySet.is(), "package.xstor", "No property set is provided!" );
     if ( !xPropertySet.is() )
         throw uno::RuntimeException();
 
@@ -115,7 +114,7 @@
     {
         ::package::StaticAddLog( rException.Message );
         ::package::StaticAddLog( OSL_LOG_PREFIX "Can't set encryption");
-        OSL_FAIL( "Can't write encryption related properties!\n" );
+        SAL_WARN( "package.xstor", "Can't write encryption related properties!" );
         throw io::IOException(); // TODO
     }
 }
@@ -123,7 +122,7 @@
 //-----------------------------------------------
 uno::Any GetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySet >& xPropertySet )
 {
-    OSL_ENSURE( xPropertySet.is(), "No property set is provided!\n" );
+    SAL_WARN_IF( !xPropertySet.is(), "package.xstor", "No property set is provided!" );
     if ( !xPropertySet.is() )
         throw uno::RuntimeException();
 
@@ -135,7 +134,7 @@
         ::package::StaticAddLog( rException.Message );
         ::package::StaticAddLog( OSL_LOG_PREFIX "Can't get encryption property" );
 
-        OSL_FAIL( "Can't get encryption related properties!\n" );
+        SAL_WARN( "package.xstor", "Can't get encryption related properties!" );
         throw io::IOException(); // TODO
     }
 }
@@ -292,9 +291,9 @@
 , m_nRelInfoStatus( RELINFO_NO_INIT )
 , m_nRelId( 1 )
 {
-    OSL_ENSURE( xPackageStream.is(), "No package stream is provided!\n" );
-    OSL_ENSURE( xPackage.is(), "No package component is provided!\n" );
-    OSL_ENSURE( m_xContext.is(), "No package stream is provided!\n" );
+    SAL_WARN_IF( !xPackageStream.is(), "package.xstor", "No package stream is provided!" );
+    SAL_WARN_IF( !xPackage.is(), "package.xstor", "No package component is provided!" );
+    SAL_WARN_IF( !m_xContext.is(), "package.xstor", "No package stream is provided!" );
     OSL_ENSURE( pParent, "No parent storage is provided!\n" );
     OSL_ENSURE( m_nStorageType == embed::StorageFormats::OFOPXML || !m_xOrigRelInfoStream.is(), 
"The Relations info makes sence only for OFOPXML format!\n" );
 }
@@ -368,10 +367,10 @@
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
-    OSL_ENSURE( m_bFlushed, "This method must not be called for nonflushed streams!\n" );
+    SAL_WARN_IF( !m_bFlushed, "package.xstor", "This method must not be called for nonflushed 
streams!" );
     if ( m_bFlushed )
     {
-        OSL_ENSURE( m_xPackageStream.is(), "An inserted stream is incomplete!\n" );
+        SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "An inserted stream is 
incomplete!\n" );
         uno::Reference< lang::XUnoTunnel > xTunnel( m_xPackageStream, uno::UNO_QUERY );
         if ( !xTunnel.is() )
             throw uno::RuntimeException(); // TODO
@@ -404,7 +403,7 @@
         uno::Any aValue = xPropSet->getPropertyValue("WasEncrypted");
         if ( !( aValue >>= bWasEncr ) )
         {
-            OSL_FAIL( "The property WasEncrypted has wrong type!\n" );
+            SAL_WARN( "package.xstor", "The property WasEncrypted has wrong type!" );
         }
     }
 
@@ -415,7 +414,7 @@
         {
             if ( !( m_aProps[nInd].Value >>= bToBeEncr ) )
             {
-                OSL_FAIL( "The property has wrong type!\n" );
+                SAL_WARN( "package.xstor", "The property has wrong type!" );
             }
         }
     }
@@ -445,7 +444,7 @@
 //-----------------------------------------------
 void OWriteStream_Impl::SetDecrypted()
 {
-    OSL_ENSURE( m_nStorageType == embed::StorageFormats::PACKAGE, "The encryption is supported 
only for package storages!\n" );
+    SAL_WARN_IF( m_nStorageType != embed::StorageFormats::PACKAGE, "package.xstor", "The 
encryption is supported only for package storages!" );
     if ( m_nStorageType != embed::StorageFormats::PACKAGE )
         throw uno::RuntimeException();
 
@@ -470,7 +469,7 @@
 //-----------------------------------------------
 void OWriteStream_Impl::SetEncrypted( const ::comphelper::SequenceAsHashMap& aEncryptionData )
 {
-    OSL_ENSURE( m_nStorageType == embed::StorageFormats::PACKAGE, "The encryption is supported 
only for package storages!\n" );
+    SAL_WARN_IF( m_nStorageType != embed::StorageFormats::PACKAGE, "package.xstor", "The 
encryption is supported only for package storages!" );
     if ( m_nStorageType != embed::StorageFormats::PACKAGE )
         throw uno::RuntimeException();
 
@@ -592,7 +591,7 @@
         {
             // in case of new inserted package stream it is possible that input stream still was 
not set
             uno::Reference< io::XStream > xCacheStream = CreateMemoryStream( m_xContext );
-            OSL_ENSURE( xCacheStream.is(), "If the stream can not be created an exception must be 
thrown!\n" );
+            SAL_WARN_IF( !xCacheStream.is(), "package.xstor", "If the stream can not be created an 
exception must be thrown!" );
             m_xCacheSeek.set( xCacheStream, uno::UNO_QUERY_THROW );
             m_xCacheStream = xCacheStream;
         }
@@ -607,7 +606,7 @@
             if ( nRead <= MAX_STORCACHE_SIZE )
             {
                 uno::Reference< io::XStream > xCacheStream = CreateMemoryStream( m_xContext );
-                OSL_ENSURE( xCacheStream.is(), "If the stream can not be created an exception must 
be thrown!\n" );
+                SAL_WARN_IF( !xCacheStream.is(), "package.xstor", "If the stream can not be 
created an exception must be thrown!" );
 
                 if ( nRead )
                 {
@@ -751,7 +750,7 @@
     // the  parent storage is responsible for the correct handling
     // of deleted and renamed contents
 
-    OSL_ENSURE( m_xPackageStream.is(), "No package stream is set!\n" );
+    SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "No package stream is set!" );
 
     if ( m_bHasDataToFlush )
         throw io::IOException();
@@ -831,7 +830,7 @@
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
 
-    OSL_ENSURE( m_xPackageStream.is(), "No package stream is set!\n" );
+    SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "No package stream is set!" );
 
     if ( !m_bHasDataToFlush )
         return;
@@ -1149,13 +1148,13 @@
                 AddLog( rException.Message );
                 AddLog( OSL_LOG_PREFIX "Quiet exception" );
 
-                OSL_FAIL( "A property can't be retrieved!\n" );
+                SAL_WARN( "package.xstor", "A property can't be retrieved!" );
             }
         }
     }
     else
     {
-        OSL_FAIL( "Can not get properties from a package stream!\n" );
+        SAL_WARN( "package.xstor", "Can not get properties from a package stream!" );
         throw uno::RuntimeException();
     }
 
@@ -1168,7 +1167,7 @@
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
 
-    OSL_ENSURE( !m_bUseCommonEncryption, "The stream can not be encrypted!" );
+    SAL_WARN_IF( m_bUseCommonEncryption, "package.xstor", "The stream can not be encrypted!" );
 
     if ( m_nStorageType != embed::StorageFormats::PACKAGE )
         throw packages::NoEncryptionException();
@@ -1232,7 +1231,7 @@
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
 
-    OSL_ENSURE( m_xPackageStream.is(), "No package stream is set!\n" );
+    SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "No package stream is set!" );
 
     if ( m_pAntiImpl )
         throw io::IOException(); // TODO:
@@ -1277,13 +1276,13 @@
             AddLog( rException.Message );
             AddLog( OSL_LOG_PREFIX "Quiet exception" );
 
-            OSL_FAIL( "Can't write encryption related properties!\n" );
+            SAL_WARN( "package.xstor", "Can't write encryption related properties!" );
             SetEncryptionKeyProperty_Impl( xPropertySet, uno::Sequence< beans::NamedValue >() );
             throw io::IOException(); // TODO:
         }
     }
 
-    OSL_ENSURE( xResultStream.is(), "In case stream can not be retrieved an exception must be 
thrown!\n" );
+    SAL_WARN_IF( !xResultStream.is(), "package.xstor", "In case stream can not be retrieved an 
exception must be thrown!" );
 
     return xResultStream;
 }
@@ -1293,7 +1292,7 @@
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
 
-    OSL_ENSURE( m_xPackageStream.is(), "No package stream is set!\n" );
+    SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "No package stream is set!" );
 
     if ( m_pAntiImpl )
         throw io::IOException(); // TODO:
@@ -1348,8 +1347,7 @@
         uno::Reference< io::XStream > xCompStream(
                         static_cast< ::cppu::OWeakObject* >( pStream ),
                         uno::UNO_QUERY );
-        OSL_ENSURE( xCompStream.is(),
-                    "OInputCompStream MUST provide XStream interfaces!\n" );
+        SAL_WARN_IF( !xCompStream.is(), "package.xstor", "OInputCompStream MUST provide XStream 
interfaces!" );
 
         m_aInputStreamsList.push_back( pStream );
         return xCompStream;
@@ -1373,8 +1371,7 @@
         uno::Reference< io::XStream > xSeekStream(
                         static_cast< ::cppu::OWeakObject* >( pStream ),
                         uno::UNO_QUERY );
-        OSL_ENSURE( xSeekStream.is(),
-                    "OInputSeekStream MUST provide XStream interfaces!\n" );
+        SAL_WARN_IF( !xSeekStream.is(), "package.xstor", "OInputSeekStream MUST provide XStream 
interfaces!" );
 
         m_aInputStreamsList.push_back( pStream );
         return xSeekStream;
@@ -1431,7 +1428,7 @@
                                 uno::Reference< io::XStream >( static_cast< ::cppu::OWeakObject* 
( m_pAntiImpl ),
                                                                 uno::UNO_QUERY );
 
-        OSL_ENSURE( xWriteStream.is(), "OWriteStream MUST implement XStream && XComponent 
interfaces!\n" );
+        SAL_WARN_IF( !xWriteStream.is(), "package.xstor", "OWriteStream MUST implement XStream && 
XComponent interfaces!" );
 
         return xWriteStream;
     }
@@ -1444,7 +1441,7 @@
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
 
-    OSL_ENSURE( m_xPackageStream.is(), "No package stream is set!\n" );
+    SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "No package stream is set!" );
 
     // this method is used only internally, this stream object should not go outside of this 
implementation
     // if ( m_pAntiImpl )
@@ -1458,12 +1455,12 @@
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
 
-    OSL_ENSURE( m_xPackageStream.is(), "No package stream is set!\n" );
+    SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "No package stream is set!" );
 
     if ( m_pAntiImpl )
         throw io::IOException(); // TODO:
 
-    OSL_ENSURE( IsEncrypted(), "Impossible to get raw representation for nonencrypted stream!\n" );
+    SAL_WARN_IF( !IsEncrypted(), "package.xstor", "Impossible to get raw representation for 
nonencrypted stream!" );
     if ( !IsEncrypted() )
         throw packages::NoEncryptionException();
 
@@ -1531,7 +1528,7 @@
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
-    OSL_ENSURE( m_xPackageStream.is(), "The source stream for copying is incomplete!\n" );
+    SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "The source stream for copying is 
incomplete!" );
     if ( !m_xPackageStream.is() )
         throw uno::RuntimeException();
 
@@ -1570,7 +1567,7 @@
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
-    OSL_ENSURE( m_xPackageStream.is(), "The source stream for copying is incomplete!\n" );
+    SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "The source stream for copying is 
incomplete!" );
     if ( !m_xPackageStream.is() )
         throw uno::RuntimeException();
 
@@ -1612,13 +1609,13 @@
 
             if ( !xDataToCopy.is() )
             {
-                OSL_FAIL( "Encrypted ZipStream must already have input stream inside!\n" );
+                SAL_WARN( "package.xstor", "Encrypted ZipStream must already have input stream 
inside!" );
                 SetEncryptionKeyProperty_Impl( xPropertySet, uno::Sequence< beans::NamedValue >() 
);
             }
         }
         catch( const uno::Exception& rException )
         {
-            OSL_FAIL( "Can't open encrypted stream!\n" );
+            SAL_WARN( "package.xstor", "Can't open encrypted stream!" );
             SetEncryptionKeyProperty_Impl( xPropertySet, uno::Sequence< beans::NamedValue >() );
             AddLog( rException.Message );
             AddLog( OSL_LOG_PREFIX "Rethrow" );
@@ -1833,7 +1830,7 @@
 
     if ( m_bInitOnDemand )
     {
-        RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OWriteStream::CheckInitOnDemand, 
initializing" );
+        SAL_INFO( "package.xstor", "package (mv76033) OWriteStream::CheckInitOnDemand, 
initializing" );
         uno::Reference< io::XStream > xStream = m_pImpl->GetTempFileAsStream();
         if ( xStream.is() )
         {
@@ -1894,7 +1891,7 @@
         m_pImpl->AddLog( OSL_LOG_PREFIX "Quiet exception" );
 
         // TODO: set the stoream in invalid state or dispose
-        OSL_FAIL( "The stream become invalid during copiing!\n" );
+        SAL_WARN( "package.xstor", "The stream become invalid during copiing!" );
         throw uno::RuntimeException();
     }
 
@@ -2323,7 +2320,7 @@
 
     if ( m_bInitOnDemand )
     {
-        RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OWriteStream::CheckInitOnDemand, 
initializing" );
+        SAL_INFO( "package.xstor", "package (mv76033) OWriteStream::CheckInitOnDemand, 
initializing" );
         uno::Reference< io::XStream > xStream = m_pImpl->GetTempFileAsStream();
         if ( xStream.is() )
         {
@@ -2512,7 +2509,7 @@
 
     if ( !xTruncate.is() )
     {
-        OSL_FAIL( "The output stream must support XTruncate interface!\n" );
+        SAL_WARN( "package.xstor", "The output stream must support XTruncate interface!" );
         throw uno::RuntimeException();
     }
 
@@ -3405,7 +3402,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OWriteStream::commit" );
+    SAL_INFO( "package.xstor", "package (mv76033) OWriteStream::commit" );
 
     if ( !m_pImpl )
     {
@@ -3470,7 +3467,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OWriteStream::revert" );
+    SAL_INFO( "package.xstor", "package (mv76033) OWriteStream::revert" );
 
     // the method removes all the changes done after last commit
 
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 073f1d1..1bb2aaf 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -42,7 +42,6 @@
 
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <rtl/logfile.hxx>
 #include <rtl/instance.hxx>
 
 #include <comphelper/processfactory.hxx>
@@ -212,7 +211,7 @@
 , m_nRelInfoStatus( RELINFO_NO_INIT )
 {
     // all the checks done below by assertion statements must be done by factory
-    OSL_ENSURE( xInputStream.is(), "No input stream is provided!\n" );
+    SAL_WARN_IF( !xInputStream.is(), "package.xstor", "No input stream is provided!" );
 
     m_pSwitchStream = (SwitchablePersistenceStream*) new SwitchablePersistenceStream( xContext, 
xInputStream );
     m_xInputStream = m_pSwitchStream->getInputStream();
@@ -220,7 +219,7 @@
     if ( m_nStorageMode & embed::ElementModes::WRITE )
     {
         // check that the stream allows to write
-        OSL_FAIL( "No stream for writing is provided!\n" );
+        SAL_WARN( "package.xstor", "No stream for writing is provided!" );
     }
 }
 
@@ -252,7 +251,7 @@
 , m_nRelInfoStatus( RELINFO_NO_INIT )
 {
     // all the checks done below by assertion statements must be done by factory
-    OSL_ENSURE( xStream.is(), "No stream is provided!\n" );
+    SAL_WARN_IF( !xStream.is(), "package.xstor", "No stream is provided!" );
 
     if ( m_nStorageMode & embed::ElementModes::WRITE )
     {
@@ -295,7 +294,7 @@
 , m_pRelStorElement( NULL )
 , m_nRelInfoStatus( RELINFO_NO_INIT )
 {
-    OSL_ENSURE( xPackageFolder.is(), "No package folder!\n" );
+    SAL_WARN_IF( !xPackageFolder.is(), "package.xstor", "No package folder!" );
 }
 
 //-----------------------------------------------
@@ -305,7 +304,7 @@
         ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
         if ( m_pAntiImpl ) // root storage wrapper must set this member to NULL before destruction 
of object
         {
-            OSL_ENSURE( !m_bIsRoot, "The root storage wrapper must be disposed already" );
+            SAL_WARN_IF( m_bIsRoot, "package.xstor", "The root storage wrapper must be disposed 
already" );
 
             try {
                 m_pAntiImpl->InternalDispose( sal_False );
@@ -453,7 +452,7 @@
 //-----------------------------------------------
 void OStorage_Impl::OpenOwnPackage()
 {
-    OSL_ENSURE( m_bIsRoot, "Opening of the package has no sence!\n" );
+    SAL_WARN_IF( !m_bIsRoot, "package.xstor", "Opening of the package has no sence!" );
 
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -466,7 +465,7 @@
                 aArguments[ 0 ] <<= m_xStream;
             else
             {
-                OSL_ENSURE( m_xInputStream.is(), "Input stream must be set for readonly access!\n" 
);
+                SAL_WARN_IF( !m_xInputStream.is(), "package.xstor", "Input stream must be set for 
readonly access!" );
                 aArguments[ 0 ] <<= m_xInputStream;
                 // TODO: if input stream is not seekable or XSeekable interface is supported
                 // on XStream object a wrapper must be used
@@ -520,7 +519,7 @@
         }
 
         uno::Reference< container::XHierarchicalNameAccess > xHNameAccess( m_xPackage, 
uno::UNO_QUERY );
-        OSL_ENSURE( xHNameAccess.is(), "The package could not be created!\n" );
+        SAL_WARN_IF( !xHNameAccess.is(), "package.xstor", "The package could not be created!" );
 
         if ( xHNameAccess.is() )
         {
@@ -529,7 +528,7 @@
         }
     }
 
-    OSL_ENSURE( m_xPackageFolder.is(), "The package root folder can not be opened!\n" );
+    SAL_WARN_IF( !m_xPackageFolder.is(), "package.xstor", "The package root folder can not be 
opened!" );
     if ( !m_xPackageFolder.is() )
         throw embed::InvalidStorageException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() 
);
 }
@@ -645,12 +644,12 @@
 
             if ( !xNamed.is() )
             {
-                OSL_FAIL( "XNamed is not supported!\n" );
+                SAL_WARN( "package.xstor", "XNamed is not supported!" );
                 throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
             }
 
             OUString aName = xNamed->getName();
-            OSL_ENSURE( !aName.isEmpty(), "Empty name!\n" );
+            SAL_WARN_IF( aName.isEmpty(), "package.xstor", "Empty name!" );
 
             uno::Reference< container::XNameContainer > xNameContainer( xNamed, uno::UNO_QUERY );
 
@@ -679,7 +678,7 @@
             AddLog( rNoSuchElementException.Message );
             AddLog( OSL_LOG_PREFIX "NoSuchElement" );
 
-            OSL_FAIL( "hasMoreElements() implementation has problems!\n" );
+            SAL_WARN( "package.xstor", "hasMoreElements() implementation has problems!" );
             break;
         }
     }
@@ -792,8 +791,8 @@
                                         OUString aName,
                                         sal_Bool bDirect )
 {
-    OSL_ENSURE( xDest.is(), "No destination storage!\n" );
-    OSL_ENSURE( !aName.isEmpty(), "Empty element name!\n" );
+    SAL_WARN_IF( !xDest.is(), "package.xstor", "No destination storage!" );
+    SAL_WARN_IF( aName.isEmpty(), "package.xstor", "Empty element name!" );
 
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -811,7 +810,7 @@
                                     xDest->openStorageElement(  aName,
                                                                 embed::ElementModes::WRITE );
 
-        OSL_ENSURE( xSubDest.is(), "No destination substorage!\n" );
+        SAL_WARN_IF( !xSubDest.is(), "package.xstor", "No destination substorage!" );
 
         if ( !pElement->m_pStorage )
         {
@@ -878,7 +877,7 @@
 
                 if ( pElement->m_pStream->HasTempFile_Impl() || 
!pElement->m_pStream->m_xPackageStream.is() )
                 {
-                    OSL_ENSURE( pElement->m_pStream->m_xPackageStream.is(), "No package stream!" );
+                    SAL_WARN_IF( !pElement->m_pStream->m_xPackageStream.is(), "package.xstor", "No 
package stream!" );
 
                     // if the stream is modified - the temporary file must be used for insertion
                     xInputToInsert = pElement->m_pStream->GetTempFileAsInputStream();
@@ -901,14 +900,14 @@
                 uno::Reference< io::XStream > xSubStr =
                                             xDest->openStreamElement( aName,
                                             embed::ElementModes::READWRITE | 
embed::ElementModes::TRUNCATE );
-                OSL_ENSURE( xSubStr.is(), "No destination substream!\n" );
+                SAL_WARN_IF( !xSubStr.is(), "package.xstor", "No destination substream!" );
 
                 pElement->m_pStream->CopyInternallyTo_Impl( xSubStr );
             }
         }
         else if ( m_nStorageType != embed::StorageFormats::PACKAGE )
         {
-            OSL_FAIL( "Encryption is only supported in package storage!\n" );
+            SAL_WARN( "package.xstor", "Encryption is only supported in package storage!" );
             throw io::IOException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
         }
         else if ( pElement->m_pStream->HasCachedEncryptionData()
@@ -950,7 +949,7 @@
                                             xDest2->openEncryptedStream( aName,
                                                 embed::ElementModes::READWRITE | 
embed::ElementModes::TRUNCATE,
                                                 
pElement->m_pStream->GetCachedEncryptionData().getAsConstNamedValueList() );
-                OSL_ENSURE( xSubStr.is(), "No destination substream!\n" );
+                SAL_WARN_IF( !xSubStr.is(), "package.xstor", "No destination substream!" );
 
                 pElement->m_pStream->CopyInternallyTo_Impl( xSubStr, 
pElement->m_pStream->GetCachedEncryptionData() );
             }
@@ -968,7 +967,7 @@
                 uno::Reference< io::XStream > xDestStream =
                                             xDest->openStreamElement( aName,
                                                 embed::ElementModes::READWRITE | 
embed::ElementModes::TRUNCATE );
-                OSL_ENSURE( xDestStream.is(), "No destination substream!\n" );
+                SAL_WARN_IF( !xDestStream.is(), "package.xstor", "No destination substream!" );
                 completeStorageStreamCopy_Impl( xOwnStream, xDestStream, m_nStorageType, 
GetAllRelationshipsIfAny() );
 
                 uno::Reference< beans::XPropertySet > xProps( xDestStream, uno::UNO_QUERY_THROW );
@@ -1014,7 +1013,7 @@
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
-    OSL_ENSURE( m_xPackageFolder.is(), "A commited storage is incomplete!\n" );
+    SAL_WARN_IF( !m_xPackageFolder.is(), "package.xstor", "A commited storage is incomplete!" );
     if ( !m_xPackageFolder.is() )
         throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
 
@@ -1035,7 +1034,7 @@
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
-    OSL_ENSURE( m_xPackageFolder.is(), "An inserted storage is incomplete!\n" );
+    SAL_WARN_IF( !m_xPackageFolder.is(), "package.xstor", "An inserted storage is incomplete!" );
     uno::Reference< lang::XUnoTunnel > xTunnel( m_xPackageFolder, uno::UNO_QUERY );
     if ( !xTunnel.is() )
         throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
@@ -1059,7 +1058,7 @@
     ReadContents();
 
     // if storage is commited it should have a valid Package representation
-    OSL_ENSURE( m_xPackageFolder.is(), "The package representation should exist!\n" );
+    SAL_WARN_IF( !m_xPackageFolder.is(), "package.xstor", "The package representation should 
exist!" );
     if ( !m_xPackageFolder.is() )
         throw embed::InvalidStorageException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() 
);
 
@@ -1264,7 +1263,7 @@
     {
         uno::Reference< util::XChangesBatch > xChangesBatch( m_xPackage, uno::UNO_QUERY );
 
-        OSL_ENSURE( xChangesBatch.is(), "Impossible to commit package!\n" );
+        SAL_WARN_IF( !xChangesBatch.is(), "package.xstor", "Impossible to commit package!" );
         if ( !xChangesBatch.is() )
             throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
 
@@ -1388,7 +1387,7 @@
 //-----------------------------------------------
 SotElement_Impl* OStorage_Impl::FindElement( const OUString& rName )
 {
-    OSL_ENSURE( !rName.isEmpty(), "Name is empty!" );
+    SAL_WARN_IF( rName.isEmpty(), "package.xstor", "Name is empty!" );
 
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -1407,7 +1406,7 @@
 //-----------------------------------------------
 SotElement_Impl* OStorage_Impl::InsertStream( OUString aName, sal_Bool bEncr )
 {
-    OSL_ENSURE( m_xPackage.is(), "Not possible to refer to package as to factory!\n" );
+    SAL_WARN_IF( !m_xPackage.is(), "package.xstor", "Not possible to refer to package as to 
factory!" );
     if ( !m_xPackage.is() )
         throw embed::InvalidStorageException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() 
);
 
@@ -1416,7 +1415,7 @@
     uno::Reference< lang::XUnoTunnel > xNewElement( m_xPackage->createInstanceWithArguments( aSeq 
),
                                                     uno::UNO_QUERY );
 
-    OSL_ENSURE( xNewElement.is(), "Not possible to create a new stream!\n" );
+    SAL_WARN_IF( !xNewElement.is(), "package.xstor", "Not possible to create a new stream!" );
     if ( !xNewElement.is() )
         throw io::IOException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
 
@@ -1443,7 +1442,7 @@
 SotElement_Impl* OStorage_Impl::InsertRawStream( OUString aName, const uno::Reference< 
io::XInputStream >& xInStream )
 {
     // insert of raw stream means insert and commit
-    OSL_ENSURE( m_xPackage.is(), "Not possible to refer to package as to factory!\n" );
+    SAL_WARN_IF( !m_xPackage.is(), "package.xstor", "Not possible to refer to package as to 
factory!" );
     if ( !m_xPackage.is() )
         throw embed::InvalidStorageException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() 
);
 
@@ -1459,7 +1458,7 @@
     uno::Reference< lang::XUnoTunnel > xNewElement( m_xPackage->createInstanceWithArguments( aSeq 
),
                                                     uno::UNO_QUERY );
 
-    OSL_ENSURE( xNewElement.is(), "Not possible to create a new stream!\n" );
+    SAL_WARN_IF( !xNewElement.is(), "package.xstor", "Not possible to create a new stream!" );
     if ( !xNewElement.is() )
         throw io::IOException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
 
@@ -1485,7 +1484,7 @@
 //-----------------------------------------------
 OStorage_Impl* OStorage_Impl::CreateNewStorageImpl( sal_Int32 nStorageMode )
 {
-    OSL_ENSURE( m_xPackage.is(), "Not possible to refer to package as to factory!\n" );
+    SAL_WARN_IF( !m_xPackage.is(), "package.xstor", "Not possible to refer to package as to 
factory!" );
     if ( !m_xPackage.is() )
         throw embed::InvalidStorageException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() 
);
 
@@ -1494,7 +1493,7 @@
     uno::Reference< lang::XUnoTunnel > xNewElement( m_xPackage->createInstanceWithArguments( aSeq 
),
                                                     uno::UNO_QUERY );
 
-    OSL_ENSURE( xNewElement.is(), "Not possible to create a new storage!\n" );
+    SAL_WARN_IF( !xNewElement.is(), "package.xstor", "Not possible to create a new storage!" );
     if ( !xNewElement.is() )
         throw io::IOException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
 
@@ -1535,10 +1534,10 @@
     {
         if ( (*pElementIter)->m_aName == aName )
         {
-            OSL_ENSURE( (*pElementIter)->m_bIsRemoved, "Try to insert an element instead of 
existing one!\n" );
+            SAL_WARN_IF( !(*pElementIter)->m_bIsRemoved, "package.xstor", "Try to insert an 
element instead of existing one!" );
             if ( (*pElementIter)->m_bIsRemoved )
             {
-                OSL_ENSURE( !(*pElementIter)->m_bIsInserted, "Inserted elements must be deleted 
immediatelly!\n" );
+                SAL_WARN_IF( (*pElementIter)->m_bIsInserted, "package.xstor", "Inserted elements 
must be deleted immediatelly!" );
                 pDeletedElm = *pElementIter;
                 break;
             }
@@ -1563,14 +1562,14 @@
 //-----------------------------------------------
 void OStorage_Impl::OpenSubStorage( SotElement_Impl* pElement, sal_Int32 nStorageMode )
 {
-    OSL_ENSURE( pElement, "pElement is not set!\n" );
-    OSL_ENSURE( pElement->m_bIsStorage, "Storage flag is not set!\n" );
+    SAL_WARN_IF( !pElement, "package.xstor", "pElement is not set!" );
+    SAL_WARN_IF( !pElement->m_bIsStorage, "package.xstor", "Storage flag is not set!" );
 
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
     if ( !pElement->m_pStorage )
     {
-        OSL_ENSURE( !pElement->m_bIsInserted, "Inserted element must be created already!\n" );
+        SAL_WARN_IF( pElement->m_bIsInserted, "package.xstor", "Inserted element must be created 
already!" );
 
         uno::Reference< lang::XUnoTunnel > xTunnel;
         m_xPackageFolder->getByName( pElement->m_aOriginalName ) >>= xTunnel;
@@ -1579,7 +1578,7 @@
 
         uno::Reference< container::XNameContainer > xPackageSubFolder( xTunnel, uno::UNO_QUERY );
 
-        OSL_ENSURE( xPackageSubFolder.is(), "Can not get XNameContainer interface from folder!\n" 
);
+        SAL_WARN_IF( !xPackageSubFolder.is(), "package.xstor", "Can not get XNameContainer 
interface from folder!" );
 
         if ( !xPackageSubFolder.is() )
             throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
@@ -1591,14 +1590,14 @@
 //-----------------------------------------------
 void OStorage_Impl::OpenSubStream( SotElement_Impl* pElement )
 {
-    OSL_ENSURE( pElement, "pElement is not set!\n" );
-    OSL_ENSURE( !pElement->m_bIsStorage, "Storage flag is set!\n" );
+    SAL_WARN_IF( !pElement, "package.xstor", "pElement is not set!" );
+    SAL_WARN_IF( pElement->m_bIsStorage, "package.xstor", "Storage flag is set!" );
 
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
     if ( !pElement->m_pStream )
     {
-        OSL_ENSURE( !pElement->m_bIsInserted, "Inserted element must be created already!\n" );
+        SAL_WARN_IF( pElement->m_bIsInserted, "package.xstor", "Inserted element must be created 
already!" );
 
         uno::Reference< lang::XUnoTunnel > xTunnel;
         m_xPackageFolder->getByName( pElement->m_aOriginalName ) >>= xTunnel;
@@ -1639,7 +1638,7 @@
 //-----------------------------------------------
 void OStorage_Impl::RemoveElement( SotElement_Impl* pElement )
 {
-    OSL_ENSURE( pElement, "Element must be provided!" );
+    SAL_WARN_IF( !pElement, "package.xstor", "Element must be provided!" );
 
     if ( !pElement )
         return;
@@ -1776,7 +1775,7 @@
 
     if ( m_nStorageType == embed::StorageFormats::OFOPXML && pStreamElement->m_pStream )
     {
-        OSL_ENSURE( !pStreamElement->m_aName.isEmpty(), "The name must not be empty!\n" );
+        SAL_WARN_IF( pStreamElement->m_aName.isEmpty(), "package.xstor", "The name must not be 
empty!" );
 
         if ( !m_xRelStorage.is() )
         {
@@ -1999,7 +1998,7 @@
 //-----------------------------------------------
 void SAL_CALL OStorage::InternalDispose( sal_Bool bNotifyImpl )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::InternalDispose" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::InternalDispose" );
 
     if ( !m_pImpl )
     {
@@ -2111,7 +2110,7 @@
 
     m_pImpl->m_bBroadcastModified = sal_False;
 
-    OSL_ENSURE( !m_pData->m_bReadOnlyWrap, "The storage can not be modified at all!\n" );
+    SAL_WARN_IF( m_pData->m_bReadOnlyWrap, "package.xstor", "The storage can not be modified at 
all!" );
 
        lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >(this) );
 
@@ -2144,7 +2143,7 @@
         throw lang::DisposedException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
     }
 
-    OSL_ENSURE( !m_pData->m_bReadOnlyWrap, "The storage can not be modified at all!\n" );
+    SAL_WARN_IF( m_pData->m_bReadOnlyWrap, "package.xstor", "The storage can not be modified at 
all!" );
 
        lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >(this) );
 
@@ -2202,7 +2201,7 @@
         throw io::IOException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
     }
 
-    OSL_ENSURE( pElement, "In case element can not be created an exception must be thrown!" );
+    SAL_WARN_IF( !pElement, "package.xstor", "In case element can not be created an exception must 
be thrown!" );
 
     if ( !pElement->m_pStream )
         m_pImpl->OpenSubStream( pElement );
@@ -2404,7 +2403,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::copyToStorage" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::copyToStorage" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2472,7 +2471,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::openStreamElement" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::openStreamElement" );
 
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2498,7 +2497,7 @@
         OSL_ENSURE( pElement && pElement->m_pStream, "In case element can not be created an 
exception must be thrown!" );
 
         xResult = pElement->m_pStream->GetStream( nOpenMode, sal_False );
-        OSL_ENSURE( xResult.is(), "The method must throw exception instead of removing empty 
result!\n" );
+        SAL_WARN_IF( !xResult.is(), "package.xstor", "The method must throw exception instead of 
removing empty result!" );
 
         if ( m_pData->m_bReadOnlyWrap )
         {
@@ -2575,7 +2574,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::openEncryptedStreamElement" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::openEncryptedStreamElement" );
 
     return openEncryptedStream( aStreamName, nOpenMode, 
::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) );
 }
@@ -2589,7 +2588,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::openStorageElement" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::openStorageElement" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2743,7 +2742,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::cloneStreamElement" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::cloneStreamElement" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2827,7 +2826,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::cloneEncryptedStreamElement" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::cloneEncryptedStreamElement" );
 
     return cloneEncryptedStream( aStreamName, 
::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) );
 }
@@ -2841,7 +2840,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::copyLastCommitTo" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::copyLastCommitTo" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2908,7 +2907,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::copyStorageElementLastCommitTo" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::copyStorageElementLastCommitTo" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3141,7 +3140,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::removeElement" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::removeElement" );
 
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3234,7 +3233,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::renameElement" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::renameElement" );
 
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3339,7 +3338,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::copyElementTo" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::copyElementTo" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3442,7 +3441,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::moveElementTo" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::moveElementTo" );
 
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3558,7 +3557,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::openEncryptedStream" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::openEncryptedStream" );
 
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3584,7 +3583,7 @@
         OSL_ENSURE( pElement && pElement->m_pStream, "In case element can not be created an 
exception must be thrown!" );
 
         xResult = pElement->m_pStream->GetStream( nOpenMode, aEncryptionData, sal_False );
-        OSL_ENSURE( xResult.is(), "The method must throw exception instead of removing empty 
result!\n" );
+        SAL_WARN_IF( !xResult.is(), "package.xstor", "The method must throw exception instead of 
removing empty result!" );
 
         if ( m_pData->m_bReadOnlyWrap )
         {
@@ -3668,7 +3667,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::cloneEncryptedStream" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::cloneEncryptedStream" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3761,7 +3760,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::getPlainRawStreamElement" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::getPlainRawStreamElement" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3869,7 +3868,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::getRawEncrStreamElement" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::getRawEncrStreamElement" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3987,7 +3986,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::insertRawEncrStreamElement" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::insertRawEncrStreamElement" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4081,7 +4080,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::commit" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::commit" );
 
     uno::Reference< util::XModifiable > xParentModif;
 
@@ -4147,7 +4146,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::revert" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::revert" );
 
     // the method removes all the changes done after last commit
 
@@ -4345,7 +4344,7 @@
                 lang::WrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::getByName" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::getByName" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4411,7 +4410,7 @@
 uno::Sequence< OUString > SAL_CALL OStorage::getElementNames()
         throw ( uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::getElementNames" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::getElementNames" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4449,7 +4448,7 @@
 sal_Bool SAL_CALL OStorage::hasByName( const OUString& aName )
         throw ( uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::hasByName" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::hasByName" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4513,7 +4512,7 @@
 sal_Bool SAL_CALL OStorage::hasElements()
         throw ( uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::hasElements" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::hasElements" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4628,7 +4627,7 @@
     throw ( uno::RuntimeException,
             io::IOException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::setEncryptionPassword" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::setEncryptionPassword" );
     setEncryptionData( ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) );
 }
 
@@ -4637,7 +4636,7 @@
     throw ( uno::RuntimeException,
             io::IOException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::removeEncryption" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::removeEncryption" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4650,7 +4649,7 @@
     if ( m_pData->m_nStorageType != embed::StorageFormats::PACKAGE )
         throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); // the 
interface must be visible only for package storage
 
-    OSL_ENSURE( m_pData->m_bIsRoot, "removeEncryption() method is not available for nonroot 
storages!\n" );
+    SAL_WARN_IF( !m_pData->m_bIsRoot, "package.xstor", "removeEncryption() method is not available 
for nonroot storages!" );
     if ( m_pData->m_bIsRoot )
     {
         try {
@@ -4691,7 +4690,7 @@
             m_pImpl->AddLog( rRException.Message );
             m_pImpl->AddLog( OSL_LOG_PREFIX "Rethrow" );
 
-            OSL_ENSURE( sal_False, "The call must not fail, it is pretty simple!" );
+            SAL_WARN( "package.xstor", "The call must not fail, it is pretty simple!" );
             throw;
         }
         catch( const uno::Exception& rException )
@@ -4699,7 +4698,7 @@
             m_pImpl->AddLog( rException.Message );
             m_pImpl->AddLog( OSL_LOG_PREFIX "Rethrow" );
 
-            OSL_FAIL( "The call must not fail, it is pretty simple!" );
+            SAL_WARN( "package.xstor", "The call must not fail, it is pretty simple!" );
             throw io::IOException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
         }
     }
@@ -4713,7 +4712,7 @@
     throw ( io::IOException,
             uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::setEncryptionData" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::setEncryptionData" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4729,7 +4728,7 @@
     if ( !aEncryptionData.getLength() )
         throw uno::RuntimeException( OSL_LOG_PREFIX "Unexpected empty encryption data!", 
uno::Reference< uno::XInterface >() );
 
-    OSL_ENSURE( m_pData->m_bIsRoot, "setEncryptionData() method is not available for nonroot 
storages!\n" );
+    SAL_WARN_IF( !m_pData->m_bIsRoot, "package.xstor", "setEncryptionData() method is not 
available for nonroot storages!" );
     if ( m_pData->m_bIsRoot )
     {
         try {
@@ -4789,7 +4788,7 @@
 void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::NamedValue >& 
aAlgorithms )
     throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::setEncryptionAlgorithms" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::setEncryptionAlgorithms" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4805,7 +4804,7 @@
     if ( !aAlgorithms.getLength() )
         throw uno::RuntimeException( OSL_LOG_PREFIX "Unexpected empty encryption algorithms 
list!", uno::Reference< uno::XInterface >() );
 
-    OSL_ENSURE( m_pData->m_bIsRoot, "setEncryptionAlgorithms() method is not available for nonroot 
storages!\n" );
+    SAL_WARN_IF( !m_pData->m_bIsRoot, "package.xstor", "setEncryptionAlgorithms() method is not 
available for nonroot storages!" );
     if ( m_pData->m_bIsRoot )
     {
         try {
@@ -4855,7 +4854,7 @@
 uno::Sequence< beans::NamedValue > SAL_CALL OStorage::getEncryptionAlgorithms()
     throw (uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::getEncryptionAlgorithms" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::getEncryptionAlgorithms" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4869,7 +4868,7 @@
         throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); // the 
interface must be visible only for package storage
 
     uno::Sequence< beans::NamedValue > aResult;
-    OSL_ENSURE( m_pData->m_bIsRoot, "getEncryptionAlgorithms() method is not available for nonroot 
storages!\n" );
+    SAL_WARN_IF( !m_pData->m_bIsRoot, "package.xstor", "getEncryptionAlgorithms() method is not 
available for nonroot storages!" );
     if ( m_pData->m_bIsRoot )
     {
         try {
@@ -4946,7 +4945,7 @@
                 lang::WrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::setPropertyValue" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::setPropertyValue" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5055,7 +5054,7 @@
                 lang::WrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::getPropertyValue" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::getPropertyValue" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5652,7 +5651,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::insertStreamElementDirect" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::insertStreamElementDirect" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5744,7 +5743,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::copyElementDirectlyTo" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::copyElementDirectlyTo" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5843,7 +5842,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::writeAndAttachToStream" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::writeAndAttachToStream" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5915,7 +5914,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::attachToURL" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::attachToURL" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -6000,7 +5999,7 @@
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::getElementPropertyValue" );
+    SAL_INFO( "package.xstor", "package (mv76033) OStorage::getElementPropertyValue" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -6126,7 +6125,7 @@
         uno::Reference< io::XStream > xNonconstRef = xTargetStream;
         m_pImpl->CloneStreamElement( aStreamName, sal_False, ::comphelper::SequenceAsHashMap(), 
xNonconstRef );
 
-        OSL_ENSURE( xNonconstRef == xTargetStream, "The provided stream reference seems not be 
filled in correctly!\n" );
+        SAL_WARN_IF( xNonconstRef != xTargetStream, "package.xstor", "The provided stream 
reference seems not be filled in correctly!" );
         if ( xNonconstRef != xTargetStream )
             throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); // 
if the stream reference is set it must not be changed!
     }
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 9763062..b99a815 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/logfile.hxx>
 #include <rtl/strbuf.hxx>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
@@ -211,7 +210,7 @@
     DBG_ASSERT(rxContext.is(), "factory missing");
     DBG_ASSERT(NULL != pFilterName,"I need a service name for the component!");
 
-    RTL_LOGFILE_CONTEXT( aLog, "ReadThroughComponent" );
+    SAL_INFO( "sd.filter", "ReadThroughComponent" );
 
     // prepare ParserInputSrouce
     xml::sax::InputSource aParserInput;
@@ -220,17 +219,17 @@
 
     // get parser
     Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(rxContext);
-    RTL_LOGFILE_CONTEXT_TRACE( aLog, "parser created" );
+    SAL_INFO( "sd.filter", "parser created" );
 
     // get filter
     OUString aFilterName(OUString::createFromAscii(pFilterName));
     Reference< xml::sax::XDocumentHandler > xFilter(
         rxContext->getServiceManager()->createInstanceWithArgumentsAndContext(aFilterName, 
rFilterArguments, rxContext),
         UNO_QUERY );
-    SAL_WARN_IF(!xFilter.is(), "sd", "Can't instantiate filter component: " << aFilterName);
+    SAL_WARN_IF(!xFilter.is(), "sd.filter", "Can't instantiate filter component: " << aFilterName);
     if( !xFilter.is() )
         return SD_XML_READERROR;
-    RTL_LOGFILE_CONTEXT_TRACE1( aLog, "%s created", pFilterName );
+    SAL_INFO( "sd.filter", "" << pFilterName << " created" );
 
     // connect parser and filter
     xParser->setDocumentHandler( xFilter );
@@ -239,7 +238,7 @@
     Reference < XImporter > xImporter( xFilter, UNO_QUERY );
     xImporter->setTargetDocument( xModelComponent );
     // finally, parser the stream
-    RTL_LOGFILE_CONTEXT_TRACE( aLog, "parsing stream" );
+    SAL_INFO( "sd.filter", "parsing stream" );
     try
     {
         xParser->parseStream( aParserInput );
@@ -268,10 +267,7 @@
             return ERRCODE_SFX_WRONGPASSWORD;
 
 #if OSL_DEBUG_LEVEL > 1
-        OStringBuffer aError("SAX parse exception caught while importing:\n");
-        aError.append(OUStringToOString(r.Message,
-            RTL_TEXTENCODING_ASCII_US));
-        OSL_FAIL(aError.getStr());
+        SAL_WARN( "sd.filter", "SAX parse exception caught while importing:" << r.Message);
 #endif
 
         String sErr( OUString::number( r.LineNumber ));
@@ -303,20 +299,14 @@
             return ERRCODE_SFX_WRONGPASSWORD;
 
 #if OSL_DEBUG_LEVEL > 1
-        OStringBuffer aError("SAX exception caught while importing:\n");
-        aError.append(OUStringToOString(r.Message,
-            RTL_TEXTENCODING_ASCII_US));
-        OSL_FAIL(aError.getStr());
+        SAL_WARN( "sd.filter", "SAX exception caught while importing:" << r.Message);
 #endif
         return SD_XML_READERROR;
     }
     catch (const packages::zip::ZipIOException& r)
     {
 #if OSL_DEBUG_LEVEL > 1
-        OStringBuffer aError("Zip exception caught while importing:\n");
-        aError.append(OUStringToOString(r.Message,
-            RTL_TEXTENCODING_ASCII_US));
-        OSL_FAIL(aError.getStr());
+        SAL_WARN( "sd.filter", "Zip exception caught while importing:" << r.Message);
 #else
         (void)r;
 #endif
@@ -325,10 +315,7 @@
     catch (const io::IOException& r)
     {
 #if OSL_DEBUG_LEVEL > 1
-        OStringBuffer aError("IO exception caught while importing:\n");
-        aError.append(OUStringToOString(r.Message,
-            RTL_TEXTENCODING_ASCII_US));
-        OSL_FAIL(aError.getStr());
+        SAL_WARN( "sd.filter", "IO exception caught while importing:" << r.Message);
 #else
         (void)r;
 #endif
@@ -337,10 +324,7 @@
     catch (const uno::Exception& r)
     {
 #if OSL_DEBUG_LEVEL > 1
-        OStringBuffer aError("uno exception caught while importing:\n");
-        aError.append(OUStringToOString(r.Message,
-            RTL_TEXTENCODING_ASCII_US));
-        OSL_FAIL(aError.getStr());
+        SAL_WARN( "sd.filter", "uno exception caught while importing:" << r.Message);
 #else
         (void)r;
 #endif
@@ -450,10 +434,10 @@
 
 sal_Bool SdXMLFilter::Import( ErrCode& nError )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sd", "cl93746", "SdXMLFilter::Import" );
+    SAL_INFO( "sd.filter", "sd cl93746 SdXMLFilter::Import" );
 #ifdef TIMELOG
     OString aFile(OUStringToOString(mrMedium.GetName(), RTL_TEXTENCODING_ASCII_US));
-    RTL_LOGFILE_CONTEXT_TRACE1( aLog, "importing %s", aFile.getStr() );
+    SAL_INFO( "sd.filter", "importing " << aFile.getStr() );
 #endif
 
     sal_uInt32  nRet = 0;
@@ -755,7 +739,7 @@
         }
         catch (const Exception&)
         {
-            OSL_FAIL("sd::SdXMLFilter::Import(), exception during clearing of unused named items");
+            SAL_WARN( "sd.filter","sd::SdXMLFilter::Import(), exception during clearing of unused 
named items");
         }
     }
 
@@ -828,9 +812,9 @@
 sal_Bool SdXMLFilter::Export()
 {
 #ifdef TIMELOG
-    RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sd", "cl93746", "SdXMLFilter::Export" );
+    SAL_INFO( "sd.filter", "sd cl93746 SdXMLFilter::Export" );
     OString aFile(OUStringToOString(mrMedium.GetName(), RTL_TEXTENCODING_ASCII_US));
-    RTL_LOGFILE_CONTEXT_TRACE1( aLog, "exporting %s", aFile.getStr() );
+    SAL_INFO( "sd.filter", "exporting " << aFile.getStr() );
 #endif
 
     SvXMLEmbeddedObjectHelper*  pObjectHelper = NULL;
@@ -839,7 +823,7 @@
 
     if( !mxModel.is() )
     {
-        OSL_FAIL("Got NO Model in XMLExport");
+        SAL_WARN( "sd.filter","Got NO Model in XMLExport");
         return sal_False;
     }
 
@@ -853,7 +837,7 @@
 
         if( !xServiceInfo.is() || !xServiceInfo->supportsService( 
"com.sun.star.drawing.GenericDrawingDocument" ) )
         {
-            OSL_FAIL( "Model is no DrawingDocument in XMLExport" );
+            SAL_WARN( "sd.filter", "Model is no DrawingDocument in XMLExport" );
             return sal_False;
         }
 
@@ -997,7 +981,7 @@
             // doc export
             do
             {
-                RTL_LOGFILE_CONTEXT_TRACE1( aLog, "exporting substream %s", pServices->mpStream );
+                SAL_INFO( "sd.filter", "exporting substream " << pServices->mpStream );
 
                 uno::Reference<io::XOutputStream> xDocOut;
                 if( xStorage.is() )
@@ -1065,10 +1049,7 @@
     catch (const uno::Exception &e)
     {
 #if OSL_DEBUG_LEVEL > 1
-        OStringBuffer aError("uno Exception caught while exporting:\n");
-        aError.append(OUStringToOString(e.Message,
-            RTL_TEXTENCODING_ASCII_US));
-        OSL_FAIL(aError.getStr());
+        SAL_WARN( "sd.filter", "uno Exception caught while exporting:" << e.Message);
 #else
         (void)e;
 #endif
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index b973bc4..78c317c 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -63,7 +63,6 @@
 #include <basic/basmgr.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
-#include <rtl/logfile.hxx>
 #include <sfx2/appuno.hxx>
 #include "sfx2/sfxhelp.hxx"
 #include <sfx2/request.hxx>
@@ -149,7 +148,7 @@
     ::osl::MutexGuard aGuard(theApplicationMutex::get());
     if (!pApp)
     {
-        RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxApplication::SetApp" );
+        SAL_INFO( "sfx2.appl", "sfx2 (mb93783) ::SfxApplication::SetApp" );
 
         pApp = new SfxApplication;
 
@@ -183,7 +182,7 @@
 SfxApplication::SfxApplication()
     : pAppData_Impl( 0 )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxApplication::SfxApplication" );
+    SAL_INFO( "sfx2.appl", "sfx2 (mb93783) ::SfxApplication::SfxApplication" );
 
     SetName( OUString("StarOffice") );
     SvtViewOptions::AcquireOptions();
@@ -191,7 +190,7 @@
     pAppData_Impl = new SfxAppData_Impl( this );
     pAppData_Impl->m_xImeStatusWindow->init();
 
-    RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ initialize DDE" );
+    SAL_INFO( "sfx2.appl", "{ initialize DDE" );
 
     sal_Bool bOk = InitializeDde();
 
@@ -218,7 +217,7 @@
     pBasic   = new BasicDLL;
     StarBASIC::SetGlobalErrorHdl( LINK( this, SfxApplication, GlobalBasicErrorHdl_Impl ) );
 #endif
-    RTL_LOGFILE_CONTEXT_TRACE( aLog, "} initialize DDE" );
+    SAL_INFO( "sfx2.appl", "} initialize DDE" );
 }
 
 SfxApplication::~SfxApplication()
@@ -571,7 +570,7 @@
     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
     if ( pFact )
     {
-        OSL_TRACE("create selector dialog");
+        SAL_INFO( "sfx2.appl", "create selector dialog");
 
         const SfxViewFrame* pViewFrame = SfxViewFrame::Current();
         const SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetFrame() : NULL;
@@ -580,11 +579,11 @@
           AbstractScriptSelectorDialog* pDlg =
             pFact->CreateScriptSelectorDialog( NULL, sal_False, xFrame );
 
-        OSL_TRACE("done, now exec it");
+        SAL_INFO( "sfx2.appl", "done, now exec it");
 
           sal_uInt16 nRet = pDlg->Execute();
 
-        OSL_TRACE("has returned");
+        SAL_INFO( "sfx2.appl", "has returned");
 
         if ( nRet == RET_OK )
         {
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 2a85ac9..695154b 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -43,7 +43,6 @@
 #include <unotools/moduleoptions.hxx>
 #include <cppuhelper/implbase2.hxx>
 
-#include <rtl/logfile.hxx>
 #include <vcl/edit.hxx>
 
 #include <sfx2/unoctitm.hxx>
@@ -209,7 +208,7 @@
 
 bool SfxApplication::Initialize_Impl()
 {
-    RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxApplication::Initialize_Impl" );
+    SAL_INFO( "sfx2.appl", "sfx2 (mb93783) ::SfxApplication::Initialize_Impl" );
 
 #ifdef TLX_VALIDATE
     StgIo::SetErrorLink( LINK( this, SfxStorageErrHdl, Error ) );
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 42477d0..12ea506 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -76,7 +76,6 @@
 #include <comphelper/mediadescriptor.hxx>
 #include <tools/urlobj.hxx>
 
-#include <rtl/logfile.hxx>
 #include <rtl/instance.hxx>
 
 #include <svl/ctypeitm.hxx>
@@ -792,7 +791,7 @@
     sal_uInt16 nIndex = aName.SearchAscii(": ");
     if (  nIndex != STRING_NOTFOUND )
     {
-        OSL_FAIL("Old filter name used!");
+        SAL_WARN( "sfx2.bastyp", "Old filter name used!");
         aName = rName.Copy( nIndex + 2 );
     }
 
@@ -1074,7 +1073,7 @@
         sal_Int32 nStartRealName = sFilterName.indexOf( ": ", 0 );
         if( nStartRealName != -1 )
         {
-            OSL_FAIL("Old format, not supported!");
+            SAL_WARN( "sfx2.bastyp", "Old format, not supported!");
             sFilterName = sFilterName.copy( nStartRealName+2 );
         }
 
@@ -1123,7 +1122,7 @@
 
 void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate )
 {
-    RTL_LOGFILE_CONTEXT( aMeasure, "sfx2 (as96863) ::SfxFilterContainer::ReadFilters" );
+    SAL_INFO( "sfx2.bastyp", "sfx2 (as96863) ::SfxFilterContainer::ReadFilters" );
     if ( !pFilterArr )
         CreateFilterArr();
 
@@ -1181,7 +1180,7 @@
     }
     catch(const uno::Exception&)
     {
-        DBG_ASSERT( sal_False, "SfxFilterContainer::ReadFilter()\nException detected. Possible not 
all filters could be cached.\n" );
+        SAL_WARN( "sfx2.bastyp", "SfxFilterContainer::ReadFilter()\nException detected. Possible 
not all filters could be cached.\n" );
     }
 
     if ( bUpdate )
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 746ba20..a85a500 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -85,7 +85,6 @@
 
 #include <unotools/streamwrap.hxx>
 
-#include <rtl/logfile.hxx>
 #include <osl/file.hxx>
 
 #include <comphelper/storagehelper.hxx>
@@ -512,7 +511,7 @@
         }
         else
         {
-            // TODO: OSL_FAIL("SfxMedium::GetContent()\nCreate Content? This code exists as 
fallback only. Please clarify, why its used.");
+            // TODO: SAL_WARN( "sfx2.doc", "SfxMedium::GetContent()\nCreate Content? This code 
exists as fallback only. Please clarify, why its used.");
             OUString aURL;
             if ( !pImp->m_aName.isEmpty() )
                 ::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aURL );
@@ -755,7 +754,7 @@
         OUString aURL;
         if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aURL ) )
         {
-            OSL_FAIL("Physical name not convertible!");
+            SAL_WARN( "sfx2.doc", "Physical name not convertible!");
         }
         pImp->bIsStorage = SotStorage::IsStorageFile( aURL ) && !SotStorage::IsOLEStorage( aURL);
         if ( !pImp->bIsStorage )
@@ -866,7 +865,7 @@
             }
             catch( const uno::Exception& )
             {
-                OSL_FAIL( "It must be possible to set a common password for the storage" );
+                SAL_WARN( "sfx2.doc", "It must be possible to set a common password for the 
storage" );
                 // TODO/LATER: set the error code in case of problem
                 // SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX  ) );
             }
@@ -1238,7 +1237,7 @@
     }
     catch( const uno::Exception& )
     {
-        OSL_FAIL( "Locking exception: high probability, that the content has not been created" );
+        SAL_WARN( "sfx2.doc", "Locking exception: high probability, that the content has not been 
created" );
     }
     return bResult;
 #endif
@@ -1433,7 +1432,7 @@
         }
         catch( const uno::Exception& )
         {
-            OSL_FAIL( "No possibility to get readonly version of storage from medium!\n" );
+            SAL_WARN( "sfx2.doc", "No possibility to get readonly version of storage from medium!" 
);
         }
 
         if ( GetError() ) // do not remove warnings
@@ -1469,7 +1468,7 @@
                 xComp->dispose();
             } catch( const uno::Exception& )
             {
-                OSL_FAIL( "Medium's storage is already disposed!\n" );
+                SAL_WARN( "sfx2.doc", "Medium's storage is already disposed!" );
             }
         }
 
@@ -1801,12 +1800,12 @@
     {
         // makes sence only in case logic name is set
         if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aNameURL ) )
-            OSL_FAIL( "The medium name is not convertible!\n" );
+            SAL_WARN( "sfx2.doc", "The medium name is not convertible!" );
     }
 
     if ( !aNameURL.isEmpty() && ( !pImp->m_eError || (pImp->m_eError & ERRCODE_WARNING_MASK) ) )
     {
-        RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxMedium::Transfer_Impl, copying to target" );
+        SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxMedium::Transfer_Impl, copying to target" );
 
         Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
         Reference< XOutputStream > rOutStream;
@@ -1862,7 +1861,7 @@
                }
             else
             {
-                OSL_FAIL( "Illegal Output stream parameter!\n" );
+                SAL_WARN( "sfx2.doc", "Illegal Output stream parameter!" );
                 SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX  ) );
             }
 
@@ -1935,8 +1934,7 @@
             if ( aFile.open( osl_File_OpenFlag_Write ) == osl::FileBase::E_None )
             {
                 aFile.sync();
-                OSL_TRACE("fsync'd saved file '%s'\n",
-                          OUStringToOString( aDestURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+                SAL_INFO( "sfx2.doc", "fsync'd saved file '" << aDestURL << "'" );
                 aFile.close();
             }
         }
@@ -2090,7 +2088,7 @@
                                        const String& aExtension,
                                        const String& aDestDir )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxMedium::DoInternalBackup_Impl( with destdir )" );
+    SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxMedium::DoInternalBackup_Impl( with destdir )" );
 
     if ( !pImp->m_aBackupURL.isEmpty() )
         return; // the backup was done already
@@ -2162,7 +2160,7 @@
 //------------------------------------------------------------------
 void SfxMedium::DoBackup_Impl()
 {
-    RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxMedium::DoBackup_Impl" );
+    SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxMedium::DoBackup_Impl" );
 
        // source file name is the logical name of this medium
     INetURLObject aSource( GetURLObject() );
@@ -2237,7 +2235,7 @@
             else
             {
 
-                OSL_FAIL("Couldn't remove backup file!");
+                SAL_WARN( "sfx2.doc", "Couldn't remove backup file!");
             }
         }
     }
@@ -2317,7 +2315,7 @@
             {
                 if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aFileName ) 
)
                 {
-                    OSL_FAIL("Physical name not convertible!");
+                    SAL_WARN( "sfx2.doc", "Physical name not convertible!");
                 }
             }
             else
@@ -2483,7 +2481,7 @@
         INetProtocol eProt = aUrl.GetProtocol();
         if ( eProt == INET_PROT_NOT_VALID )
         {
-            OSL_FAIL( "Unknown protocol!" );
+            SAL_WARN( "sfx2.doc", "Unknown protocol!" );
         }
         else
         {
@@ -2519,7 +2517,7 @@
           || !pImp->m_aLogicName.startsWith("private:stream")) )
     {
         pImp->m_pSet->ClearItem( SID_OUTPUTSTREAM );
-        OSL_FAIL( "Unexpected Output stream parameter!\n" );
+        SAL_WARN( "sfx2.doc", "Unexpected Output stream parameter!\n" );
     }
 
     if (!pImp->m_aLogicName.isEmpty())
@@ -2914,7 +2912,7 @@
             }
             else
             {
-                OSL_FAIL( "Can not create a new temporary file for crash recovery!\n" );
+                SAL_WARN( "sfx2.doc", "Can not create a new temporary file for crash recovery!\n" 
);
             }
         }
     }
@@ -2982,12 +2980,12 @@
         OUString aTemp;
         if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aTemp ))
         {
-            OSL_FAIL("Physical name not convertible!");
+            SAL_WARN( "sfx2.doc", "Physical name not convertible!");
         }
 
         if ( !::utl::UCBContentHelper::Kill( aTemp ) )
         {
-            OSL_FAIL("Couldn't remove temporary file!");
+            SAL_WARN( "sfx2.doc", "Couldn't remove temporary file!");
         }
     }
 
@@ -3488,7 +3486,7 @@
             }
             catch ( const uno::Exception& )
             {
-                OSL_FAIL( "Couldn't use signing functionality!\n" );
+                SAL_WARN( "sfx2.doc", "Couldn't use signing functionality!\n" );
             }
 
             CloseAndRelease();
@@ -3504,7 +3502,7 @@
             }
             catch( const uno::Exception& )
             {
-                OSL_FAIL( "Couldn't use signing functionality!\n" );
+                SAL_WARN( "sfx2.doc", "Couldn't use signing functionality!\n" );
             }
         }
 
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 902b538..29d9d2d 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -98,7 +98,6 @@
 #include <comphelper/string.hxx>
 #include <vcl/bitmapex.hxx>
 #include <svtools/embedhlp.hxx>
-#include <rtl/logfile.hxx>
 #include <basic/modsizeexceeded.hxx>
 #include <osl/file.hxx>
 
@@ -158,7 +157,7 @@
     }
     catch ( uno::Exception& )
     {
-        OSL_FAIL( "The document seems to be in the collection already!\n" );
+        SAL_WARN( "sfx2.doc", "The document seems to be in the collection already!\n" );
     }
 }
 
@@ -288,7 +287,7 @@
         }
         catch ( uno::Exception& )
         {
-            OSL_FAIL( "Creation of a storage copy is failed!" );
+            SAL_WARN( "sfx2.doc", "Creation of a storage copy is failed!" );
             ::utl::UCBContentHelper::Kill( aTempURL );
 
             aTempURL = OUString();
@@ -460,7 +459,7 @@
         }
         catch ( uno::Exception& )
         {
-            OSL_FAIL( "Can't check storage's mediatype!\n" );
+            SAL_WARN( "sfx2.doc", "Can't check storage's mediatype!" );
         }
     }
     else
@@ -1103,13 +1102,8 @@
 */
 
 {
-    RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "PERFORMANCE SfxObjectShell::SaveTo_Impl" );
-    if( RTL_LOGFILE_HASLOGFILE() )
-    {
-        OString aString(
-            OUStringToOString(rMedium.GetName(), RTL_TEXTENCODING_ASCII_US));
-        RTL_LOGFILE_PRODUCT_CONTEXT_TRACE1(aLog, "saving \"%s\"", aString.getStr());
-    }
+    SAL_INFO( "sfx2.doc", "PERFORMANCE SfxObjectShell::SaveTo_Impl" );
+    SAL_INFO( "sfx2.doc", "saving \"" << rMedium.GetName() << "\"" );
 
     AddLog( OUString( OSL_LOG_PREFIX "Begin"  ) );
 
@@ -1120,7 +1114,7 @@
     {
         // if no filter was set, use the default filter
         // this should be changed in the feature, it should be an error!
-        OSL_FAIL("No filter set!");
+        SAL_WARN( "sfx2.doc","No filter set!");
         pFilter = GetFactory().GetFilterContainer()->GetAnyFilter( SFX_FILTER_IMPORT | 
SFX_FILTER_EXPORT );
         rMedium.SetFilter(pFilter);
     }
@@ -1403,7 +1397,7 @@
             }
             catch( uno::Exception& )
             {
-                OSL_FAIL( "Setting of common encryption key failed!" );
+                SAL_WARN( "sfx2.doc", "Setting of common encryption key failed!" );
                 SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX  ) );
             }
         }
@@ -1453,7 +1447,7 @@
                                             xMedStorage ) )
             {
                 // TODO: error handling
-                OSL_FAIL( "Couldn't store thumbnail representation!" );
+                SAL_WARN( "sfx2.doc", "Couldn't store thumbnail representation!" );
             }
         }
 
@@ -1492,7 +1486,7 @@
                 catch( uno::Exception& )
                 {
                     AddLog( OUString( OSL_LOG_PREFIX "Preserve versions has failed."  ) );
-                    OSL_FAIL( "Couldn't copy versions!\n" );
+                    SAL_WARN( "sfx2.doc", "Couldn't copy versions!" );
                     bOk = sal_False;
                     // TODO/LATER: a specific error could be set
                 }
@@ -1646,7 +1640,7 @@
                         {
                             // it should not happen, the copies signature is invalid!
                             // throw the changes away
-                            OSL_FAIL( "An invalid signature was copied!" );
+                            SAL_WARN( "sfx2.doc", "An invalid signature was copied!" );
                         }
                     }
                 }
@@ -1758,7 +1752,7 @@
 //------------------------------------------------------------------------
 sal_Bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMedium& rTargetMedium )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxObjectShell::DisconnectStorage_Impl" );
+    SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::DisconnectStorage_Impl" );
 
     // this method disconnects the storage from source medium, and attaches it to the backup 
created by the target medium
 
@@ -1816,7 +1810,7 @@
 */
 
 {
-    RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxObjectShell::ConnectTmpStorage_Impl" );
+    SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::ConnectTmpStorage_Impl" );
 
     sal_Bool bResult = sal_False;
 
@@ -1905,7 +1899,7 @@
             OUString aMediaType;
             if ( !(a>>=aMediaType) || aMediaType.isEmpty() )
             {
-                OSL_FAIL( "The mediatype must be set already!\n" );
+                SAL_WARN( "sfx2.doc", "The mediatype must be set already!" );
                 SetupStorage( xNewStor, SOFFICE_FILEFORMAT_CURRENT, sal_False, false );
             }
 
@@ -1920,7 +1914,7 @@
                 }
                 catch( uno::Exception& )
                 {
-                    OSL_FAIL( "The strotage was not commited on DoSaveAs!\n" );
+                    SAL_WARN( "sfx2.doc", "The strotage was not commited on DoSaveAs!" );
                 }
             }
         }
@@ -1953,7 +1947,7 @@
 
 sal_Bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxObjectShell::DoSaveCompleted" );
+    SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::DoSaveCompleted" );
 
     sal_Bool bOk = sal_True;
     sal_Bool bMedChanged = pNewMed && pNewMed!=pMedium;
@@ -2772,7 +2766,7 @@
 
 #ifdef DBG_UTIL
     if ( pMergedParams->GetItemState( SID_DOC_SALVAGE) >= SFX_ITEM_SET )
-        OSL_FAIL("Salvage item present in Itemset, check the parameters!");
+        SAL_WARN( "sfx2.doc","Salvage item present in Itemset, check the parameters!");
 #endif
 
     // should be unneccessary - too hot to handle!
@@ -2876,7 +2870,7 @@
 
 sal_Bool SfxObjectShell::LoadFrom( SfxMedium& /*rMedium*/ )
 {
-    OSL_FAIL( "Base implementation, must not be called in general!" );
+    SAL_WARN( "sfx2.doc", "Base implementation, must not be called in general!" );
     return sal_True;
 }
 
@@ -3026,13 +3020,8 @@
 
 sal_Bool SfxObjectShell::LoadOwnFormat( SfxMedium& rMedium )
 {
-    RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "PERFORMANCE SfxObjectShell::LoadOwnFormat" );
-    if( RTL_LOGFILE_HASLOGFILE() )
-    {
-        OString aString(
-            OUStringToOString(rMedium.GetName(), RTL_TEXTENCODING_ASCII_US));
-        RTL_LOGFILE_PRODUCT_CONTEXT_TRACE1(aLog, "loading \"%s\"", aString.getStr());
-    }
+    SAL_INFO( "sfx2.doc", "PERFORMANCE SfxObjectShell::LoadOwnFormat" );
+    SAL_INFO( "sfx2.doc", "loading \" " << rMedium.GetName() << "\"" );
 
     uno::Reference< embed::XStorage > xStorage = rMedium.GetStorage();
     if ( xStorage.is() )
@@ -3123,7 +3112,7 @@
 
 sal_Bool SfxObjectShell::SaveChildren( sal_Bool bObjectsOnly )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxObjectShell::SaveChildren" );
+    SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::SaveChildren" );
 
     sal_Bool bResult = sal_True;
     if ( pImp->mpObjectContainer )
@@ -3137,7 +3126,7 @@
 
 sal_Bool SfxObjectShell::SaveAsChildren( SfxMedium& rMedium )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxObjectShell::SaveAsChildren" );
+    SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::SaveAsChildren" );
 
     sal_Bool bResult = sal_True;
 
@@ -3163,7 +3152,7 @@
 
 sal_Bool SfxObjectShell::SaveCompletedChildren( sal_Bool bSuccess )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxObjectShell::SaveCompletedChildren" );
+    SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::SaveCompletedChildren" );
 
     sal_Bool bResult = sal_True;
 
@@ -3200,7 +3189,7 @@
 sal_Bool SfxObjectShell::SwitchChildrenPersistance( const uno::Reference< embed::XStorage >& 
xStorage,
                                                     sal_Bool bForceNonModified )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxObjectShell::SwitchChildrenPersistence" );
+    SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::SwitchChildrenPersistence" );
 
     if ( !xStorage.is() )
     {
@@ -3219,7 +3208,7 @@
 // Never call this method directly, always use the DoSaveCompleted call
 sal_Bool SfxObjectShell::SaveCompleted( const uno::Reference< embed::XStorage >& xStorage )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxObjectShell::SaveCompleted" );
+    SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::SaveCompleted" );
 
     sal_Bool bResult = sal_False;
     sal_Bool bSendNotification = sal_False;
@@ -3362,7 +3351,7 @@
     }
     catch( uno::Exception& )
     {
-        OSL_FAIL( "Cant check storage consistency!\n" );
+        SAL_WARN( "sfx2.doc", "Cant check storage consistency!" );
     }
 
     return sal_True;
@@ -3371,7 +3360,7 @@
 
 sal_Bool SfxObjectShell::SwitchPersistance( const uno::Reference< embed::XStorage >& xStorage )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxObjectShell::SwitchPersistance" );
+    SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::SwitchPersistance" );
 
     sal_Bool bResult = sal_False;
 #ifdef DBG_UTIL
@@ -3406,7 +3395,7 @@
 sal_Bool SfxObjectShell::CopyStoragesOfUnknownMediaType( const uno::Reference< embed::XStorage >& 
xSource,
                                                          const uno::Reference< embed::XStorage >& 
xTarget )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxObjectShell::CopyStoragesOfUnknownMediaType" );
+    SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::CopyStoragesOfUnknownMediaType" );
 
     // This method does not commit the target storage and should not do it
     sal_Bool bResult = sal_True;
@@ -3521,7 +3510,7 @@
                                                     sal_Bool bIsTemplate,
                                                     const uno::Reference< embed::XStorage >& xStor 
)
 {
-    RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxObjectShell::GenerateAndStoreThumbnail" );
+    SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::GenerateAndStoreThumbnail" );
 
     bIsInGenerateThumbnail = sal_True;//optimize thumbnail generate and store procedure to improve 
odt saving performance, i120030
 
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 03f242b..9364fa8 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -52,7 +52,6 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <framework/interaction.hxx>
-#include <rtl/logfile.hxx>
 #include <rtl/ustring.h>
 #include <sot/storinfo.hxx>
 #include <svtools/ehdl.hxx>
@@ -311,7 +310,7 @@
         }
     }
 
-    OSL_FAIL( "SfxFrameLoader_Impl::impl_findObjectShell: model is not based on SfxObjectShell - 
wrong frame loader usage!" );
+    SAL_WARN( "sfx2.view", "SfxFrameLoader_Impl::impl_findObjectShell: model is not based on 
SfxObjectShell - wrong frame loader usage!" );
     return NULL;
 }
 
@@ -515,7 +514,7 @@
 
     SolarMutexGuard aGuard;
 
-    RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxFrameLoader::load" );
+    SAL_INFO( "sfx2.view", "sfx2 (mb93783) ::SfxFrameLoader::load" );
 
     ::comphelper::NamedValueCollection aDescriptor( rArgs );
 
diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx 
b/slideshow/source/engine/shapes/backgroundshape.cxx
index 1fe56fc..b1c8395 100644
--- a/slideshow/source/engine/shapes/backgroundshape.cxx
+++ b/slideshow/source/engine/shapes/backgroundshape.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/FontWeight.hpp>
-#include <rtl/logfile.hxx>
 
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
@@ -270,8 +269,8 @@
 
         bool BackgroundShape::render() const
         {
-            RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::BackgroundShape::render()" );
-            RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::presentation::internal::BackgroundShape: 0x%X", 
this );
+            SAL_INFO( "slideshow", "::presentation::internal::BackgroundShape::render()" );
+            SAL_INFO( "slideshow", "::presentation::internal::BackgroundShape: 0x" << std::hex << 
this );
 
             // gcc again...
             const ::basegfx::B2DRectangle& rCurrBounds( BackgroundShape::getBounds() );
diff --git a/slideshow/source/engine/shapes/drawshape.cxx 
b/slideshow/source/engine/shapes/drawshape.cxx
index ace2221..7543569 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -22,7 +22,6 @@
 #include <tools/diagnose_ex.h>
 #include <canvas/verbosetrace.hxx>
 
-#include <rtl/logfile.hxx>
 #include <osl/diagnose.hxx>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -150,8 +149,8 @@
 
         bool DrawShape::implRender( int nUpdateFlags ) const
         {
-            RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::DrawShape::implRender()" );
-            RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::presentation::internal::DrawShape: 0x%X", this );
+            SAL_INFO( "slideshow", "::presentation::internal::DrawShape::implRender()" );
+            SAL_INFO( "slideshow", "::presentation::internal::DrawShape: 0x" << std::hex << this );
 
             // will perform the update now, clear update-enforcing
             // flags
@@ -621,10 +620,7 @@
             }
             catch (uno::Exception &)
             {
-                OSL_FAIL( OUStringToOString(
-                                comphelper::anyToString(
-                                    cppu::getCaughtException() ),
-                                RTL_TEXTENCODING_UTF8 ).getStr() );
+                SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) 
);
             }
         }
 
@@ -930,7 +926,7 @@
                     {
                         if (!maHyperlinkIndices.empty() &&
                             maHyperlinkIndices.back().second == -1) {
-                            OSL_FAIL( "### pending FIELD_SEQ_END!" );
+                            SAL_WARN( "slideshow", "### pending FIELD_SEQ_END!" );
                             maHyperlinkIndices.pop_back();
                             maHyperlinkRegions.pop_back();
                         }
@@ -961,7 +957,7 @@
             }
             if (!maHyperlinkIndices.empty() &&
                 maHyperlinkIndices.back().second == -1) {
-                OSL_FAIL( "### pending FIELD_SEQ_END!" );
+                SAL_WARN( "slideshow", "### pending FIELD_SEQ_END!" );
                 maHyperlinkIndices.pop_back();
                 maHyperlinkRegions.pop_back();
             }
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx 
b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index ddb5ee4..a053055 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -24,7 +24,6 @@
 #include <canvas/verbosetrace.hxx>
 
 #include <rtl/math.hxx>
-#include <rtl/logfile.hxx>
 
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
@@ -300,7 +299,7 @@
 
         AttributableShapeSharedPtr DrawShapeSubsetting::getSubsetShape( const DocTreeNode& 
rTreeNode ) const
         {
-            RTL_LOGFILE_CONTEXT( aLog, 
"::presentation::internal::DrawShapeSubsetting::getSubsetShape()" );
+            SAL_INFO( "slideshow", 
"::presentation::internal::DrawShapeSubsetting::getSubsetShape()" );
 
             // subset shape already created for this DocTreeNode?
             SubsetEntry aEntry;
@@ -320,7 +319,7 @@
 
         void DrawShapeSubsetting::addSubsetShape( const AttributableShapeSharedPtr& rShape )
         {
-            RTL_LOGFILE_CONTEXT( aLog, 
"::presentation::internal::DrawShapeSubsetting::addSubsetShape()" );
+            SAL_INFO( "slideshow", 
"::presentation::internal::DrawShapeSubsetting::addSubsetShape()" );
 
             // subset shape already created for this DocTreeNode?
             SubsetEntry aEntry;
@@ -354,7 +353,7 @@
 
         bool DrawShapeSubsetting::revokeSubsetShape( const AttributableShapeSharedPtr& rShape )
         {
-            RTL_LOGFILE_CONTEXT( aLog, 
"::presentation::internal::DrawShapeSubsetting::revokeSubsetShape()" );
+            SAL_INFO( "slideshow", 
"::presentation::internal::DrawShapeSubsetting::revokeSubsetShape()" );
 
             // lookup subset shape
             SubsetEntry aEntry;
@@ -610,7 +609,7 @@
                     case DocTreeNode::NODETYPE_INVALID:
                         // FALLTHROUGH intended
                     default:
-                        OSL_FAIL("DrawShapeSubsetting::mapDocTreeNode(): unexpected node type");
+                        SAL_WARN( "slideshow", "DrawShapeSubsetting::mapDocTreeNode(): unexpected 
node type");
                         return DrawShapeSubsetting::CLASS_NOOP;
 
                     case DocTreeNode::NODETYPE_LOGICAL_SHAPE:
diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx 
b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
index 51e3fc3..05f255b 100644
--- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx
+++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
@@ -25,7 +25,6 @@
 #include "viewbackgroundshape.hxx"
 #include "tools.hxx"
 
-#include <rtl/logfile.hxx>
 #include <rtl/math.hxx>
 
 #include <comphelper/anytostring.hxx>
@@ -57,7 +56,7 @@
         bool ViewBackgroundShape::prefetch( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
                                             const GDIMetaFileSharedPtr&         rMtf ) const
         {
-            RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::ViewBackgroundShape::prefetch()" 
);
+            SAL_INFO( "slideshow", "::presentation::internal::ViewBackgroundShape::prefetch()" );
             ENSURE_OR_RETURN_FALSE( rMtf,
                                "ViewBackgroundShape::prefetch(): no valid metafile!" );
 
@@ -152,7 +151,7 @@
 
         bool ViewBackgroundShape::render( const GDIMetaFileSharedPtr& rMtf ) const
         {
-            RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::ViewBackgroundShape::draw()" );
+            SAL_INFO( "slideshow", "::presentation::internal::ViewBackgroundShape::draw()" );
 
             const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas( mpViewLayer->getCanvas() );
 

-- 
To view, visit https://gerrit.libreoffice.org/4128
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a7cce0d3abef42c9d9d0ad56609d94d504854cb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ioan Radu <ioan.radu.g@gmail.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.