summaryrefslogtreecommitdiff
path: root/sfx2/source/doc/docfile.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/doc/docfile.cxx')
-rw-r--r--sfx2/source/doc/docfile.cxx44
1 files changed, 21 insertions, 23 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 0c8457f01b9c..543e8e8ccb1c 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -84,7 +84,6 @@
#include <unotools/streamwrap.hxx>
-#include <rtl/logfile.hxx>
#include <osl/file.hxx>
#include <comphelper/storagehelper.hxx>
@@ -511,7 +510,7 @@ Reference < XContent > SfxMedium::GetContent() const
}
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 );
@@ -754,7 +753,7 @@ sal_Bool SfxMedium::IsStorage()
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 )
@@ -865,7 +864,7 @@ void SfxMedium::SetEncryptionDataToStorage_Impl()
}
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 ) );
}
@@ -1237,7 +1236,7 @@ bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
}
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
@@ -1432,7 +1431,7 @@ uno::Reference< embed::XStorage > SfxMedium::GetZipStorageToSign_Impl( sal_Bool
}
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
@@ -1468,7 +1467,7 @@ void SfxMedium::CloseStorage()
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!" );
}
}
@@ -1800,12 +1799,12 @@ void SfxMedium::Transfer_Impl()
{
// 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;
@@ -1861,7 +1860,7 @@ void SfxMedium::Transfer_Impl()
}
else
{
- OSL_FAIL( "Illegal Output stream parameter!\n" );
+ SAL_WARN( "sfx2.doc", "Illegal Output stream parameter!" );
SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) );
}
@@ -1934,8 +1933,7 @@ void SfxMedium::Transfer_Impl()
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();
}
}
@@ -2089,7 +2087,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont
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
@@ -2161,7 +2159,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont
//------------------------------------------------------------------
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() );
@@ -2236,7 +2234,7 @@ void SfxMedium::ClearBackup_Impl()
else
{
- OSL_FAIL("Couldn't remove backup file!");
+ SAL_WARN( "sfx2.doc", "Couldn't remove backup file!");
}
}
}
@@ -2316,7 +2314,7 @@ void SfxMedium::GetMedium_Impl()
{
if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aFileName ) )
{
- OSL_FAIL("Physical name not convertible!");
+ SAL_WARN( "sfx2.doc", "Physical name not convertible!");
}
}
else
@@ -2482,7 +2480,7 @@ void SfxMedium::Init_Impl()
INetProtocol eProt = aUrl.GetProtocol();
if ( eProt == INET_PROT_NOT_VALID )
{
- OSL_FAIL( "Unknown protocol!" );
+ SAL_WARN( "sfx2.doc", "Unknown protocol!" );
}
else
{
@@ -2518,7 +2516,7 @@ void SfxMedium::Init_Impl()
|| !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())
@@ -2913,7 +2911,7 @@ SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) :
}
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" );
}
}
}
@@ -2981,12 +2979,12 @@ SfxMedium::~SfxMedium()
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!");
}
}
@@ -3487,7 +3485,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const OUStrin
}
catch ( const uno::Exception& )
{
- OSL_FAIL( "Couldn't use signing functionality!\n" );
+ SAL_WARN( "sfx2.doc", "Couldn't use signing functionality!\n" );
}
CloseAndRelease();
@@ -3503,7 +3501,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const OUStrin
}
catch( const uno::Exception& )
{
- OSL_FAIL( "Couldn't use signing functionality!\n" );
+ SAL_WARN( "sfx2.doc", "Couldn't use signing functionality!\n" );
}
}
generated by cgit (git 2.34.1) at 2025-01-16 07:37:22 +0000