diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-11 17:14:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-12 09:57:50 +0200 |
| commit | 9e4d84daf279a63052cfd0aeebd2d67dfaf07c67 (patch) | |
| tree | 23d223df34a6636182947a9bf042945e879dbff5 /sd | |
| parent | 9b157d37f15b34720fced0b94d4541f4149a8947 (diff) | |
drop document_io_logring.txt and use global logging
Change-Id: Ibda0ce925bc76355e636022c955077ac89e66cce
Reviewed-on: https://gerrit.libreoffice.org/36434
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/sdpptwrp.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/docshell/docshel4.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index cec616602373..ef9b8fe607eb 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -94,7 +94,7 @@ bool SdPPTFilter::Import() pDocStream->SetCryptMaskKey(pStorage->GetKey()); if ( pStorage->IsStream( "EncryptedSummary" ) ) - mrMedium.SetError( ERRCODE_SVX_READ_FILTER_PPOINT, OSL_LOG_PREFIX ); + mrMedium.SetError(ERRCODE_SVX_READ_FILTER_PPOINT); else { #ifndef DISABLE_DYNLOADING @@ -106,14 +106,14 @@ bool SdPPTFilter::Import() bRet = PPTImport( &mrDocument, *pDocStream, *pStorage, mrMedium ); if ( !bRet ) - mrMedium.SetError( SVSTREAM_WRONGVERSION, OSL_LOG_PREFIX ); + mrMedium.SetError(SVSTREAM_WRONGVERSION); pLibrary->release(); //TODO: let it get unloaded? delete pLibrary; } #else bRet = ImportPPT( &mrDocument, *pDocStream, *pStorage, mrMedium ); if ( !bRet ) - mrMedium.SetError( SVSTREAM_WRONGVERSION, OSL_LOG_PREFIX ); + mrMedium.SetError(SVSTREAM_WRONGVERSION); #endif } diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 0ee9859922cd..d1e464fa38d6 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -332,12 +332,12 @@ bool DrawDocShell::Load( SfxMedium& rMedium ) else { if( nError == ERRCODE_IO_BROKENPACKAGE ) - SetError( ERRCODE_IO_BROKENPACKAGE, OSL_LOG_PREFIX ); + SetError(ERRCODE_IO_BROKENPACKAGE); // TODO/LATER: correct error handling?! - //pStore->SetError( SVSTREAM_WRONGVERSION, OUString( OSL_LOG_PREFIX ) ); + //pStore->SetError(SVSTREAM_WRONGVERSION); else - SetError( ERRCODE_ABORT, OSL_LOG_PREFIX ); + SetError(ERRCODE_ABORT); } // tell SFX to change viewshell when in preview mode @@ -592,7 +592,7 @@ bool DrawDocShell::SaveAs( SfxMedium& rMedium ) bRet = SdXMLFilter( rMedium, *this, SDXMLMODE_Normal, SotStorage::GetVersion( rMedium.GetStorage() ) ).Export(); if( GetError() == ERRCODE_NONE ) - SetError( nVBWarning, OSL_LOG_PREFIX ); + SetError(nVBWarning); return bRet; } |