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 /sw/source | |
| 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 'sw/source')
| -rw-r--r-- | sw/source/uibase/app/docsh.cxx | 10 | ||||
| -rw-r--r-- | sw/source/uibase/app/docsh2.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/app/docshini.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 6e45da59dc54..58af1d2cd3f3 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -276,7 +276,7 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium ) SW_MOD()->SetEmbeddedLoadSave( false ); - SetError( nErr, OSL_LOG_PREFIX ); + SetError(nErr); bool bOk = !IsError( nErr ); if (bOk && !m_pDoc->IsInLoadAsynchron()) @@ -366,7 +366,7 @@ bool SwDocShell::Save() } SW_MOD()->SetEmbeddedLoadSave( false ); } - SetError( nErr ? nErr : nVBWarning, OSL_LOG_PREFIX ); + SetError(nErr ? nErr : nVBWarning); SfxViewFrame *const pFrame = (m_pWrtShell) ? m_pWrtShell->GetView().GetViewFrame() : nullptr; @@ -512,7 +512,7 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium ) m_pDoc->cleanupUnoCursorTable(); } - SetError( nErr ? nErr : nVBWarning, OSL_LOG_PREFIX ); + SetError(nErr ? nErr : nVBWarning); return !IsError( nErr ); } @@ -595,7 +595,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) Sequence<OUString> aModNames = xLib->getElementNames(); if(aModNames.getLength()) { - SetError(WARN_SWG_HTML_NO_MACROS, OSL_LOG_PREFIX ); + SetError(WARN_SWG_HTML_NO_MACROS); break; } } @@ -751,7 +751,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) } SW_MOD()->SetEmbeddedLoadSave( false ); - SetError( nErrno ? nErrno : nVBWarning, OSL_LOG_PREFIX ); + SetError(nErrno ? nErrno : nVBWarning); if( !rMedium.IsStorage() ) rMedium.CloseOutStream(); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 9c4af8e901cd..e40383849f63 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -572,7 +572,7 @@ void SwDocShell::Execute(SfxRequest& rReq) bMerge = bool(nFlags & SfxTemplateFlags::MERGE_STYLES); aOpt.SetMerge( !bMerge ); - SetError( LoadStylesFromFile( aFileName, aOpt, false ), OSL_LOG_PREFIX); + SetError(LoadStylesFromFile(aFileName, aOpt, false)); if ( !GetError() ) rReq.Done(); } diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 9c6663518d99..958985974a94 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -581,7 +581,7 @@ bool SwDocShell::Load( SfxMedium& rMedium ) UpdateFontList(); InitDrawModelAndDocShell(this, m_pDoc ? m_pDoc->getIDocumentDrawModelAccess().GetDrawModel() : nullptr); - SetError( nErr, OSL_LOG_PREFIX ); + SetError(nErr); bRet = !IsError( nErr ); if (bRet && !m_pDoc->IsInLoadAsynchron() && @@ -630,7 +630,7 @@ bool SwDocShell::LoadFrom( SfxMedium& rMedium ) OSL_FAIL("Code removed!"); } - SetError( nErr, OSL_LOG_PREFIX ); + SetError(nErr); bRet = !IsError( nErr ); } while( false ); |