diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-01 09:10:49 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-01 09:41:49 -0500 |
| commit | 4de8cc346590de52170f438b3a0f29f322dcb66b (patch) | |
| tree | 46e71a9109f065bb11652fb9497af559b16cd650 /sw/source/ui/app/docsh.cxx | |
| parent | 6573aa15d49b9eb661f03d80b2c3245ac3eec472 (diff) | |
targeted string re-work
Change-Id: Ieb2e362853f146f58370a60511cc75ab64fe439e
Diffstat (limited to 'sw/source/ui/app/docsh.cxx')
| -rw-r--r-- | sw/source/ui/app/docsh.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index c5f633d50508..b4e89352c961 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -275,7 +275,7 @@ sal_Bool SwDocShell::ConvertFrom( SfxMedium& rMedium ) SW_MOD()->SetEmbeddedLoadSave( sal_False ); - SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( nErr, ::rtl::OUString( OSL_LOG_PREFIX ) ); sal_Bool bOk = !IsError( nErr ); if ( bOk && !pDoc->IsInLoadAsynchron() ) @@ -371,7 +371,7 @@ sal_Bool SwDocShell::Save() } SW_MOD()->SetEmbeddedLoadSave( sal_False ); } - SetError( nErr ? nErr : nVBWarning, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( nErr ? nErr : nVBWarning, ::rtl::OUString( OSL_LOG_PREFIX ) ); SfxViewFrame* pFrm = pWrtShell ? pWrtShell->GetView().GetViewFrame() : 0; if( pFrm ) @@ -510,7 +510,7 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium ) // Increase RSID pDoc->setRsid( pDoc->getRsid() ); } - SetError( nErr ? nErr : nVBWarning, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( nErr ? nErr : nVBWarning, ::rtl::OUString( OSL_LOG_PREFIX ) ); return !IsError( nErr ); } @@ -597,7 +597,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) Sequence<rtl::OUString> aModNames = xLib->getElementNames(); if(aModNames.getLength()) { - SetError(WARN_SWG_HTML_NO_MACROS, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError(WARN_SWG_HTML_NO_MACROS, ::rtl::OUString( OSL_LOG_PREFIX ) ); break; } } @@ -669,7 +669,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) // TODO/MBA: testing uno::Reference < beans::XPropertySet > xSet( rMedium.GetStorage(), uno::UNO_QUERY ); if ( xSet.is() ) - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny( ::rtl::OUString( SotExchange::GetFormatMimeType( nSaveClipId ) ) ) ); + xSet->setPropertyValue( ::rtl::OUString("MediaType"), uno::makeAny( ::rtl::OUString( SotExchange::GetFormatMimeType( nSaveClipId ) ) ) ); } catch (const uno::Exception&) { @@ -753,7 +753,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) } SW_MOD()->SetEmbeddedLoadSave( sal_False ); - SetError( nErrno ? nErrno : nVBWarning, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( nErrno ? nErrno : nVBWarning, ::rtl::OUString( OSL_LOG_PREFIX ) ); if( !rMedium.IsStorage() ) rMedium.CloseOutStream(); |