summaryrefslogtreecommitdiff
path: root/sc/source/ui/docshell/docsh.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/docshell/docsh.cxx')
-rw-r--r--sc/source/ui/docshell/docsh.cxx56
1 files changed, 28 insertions, 28 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index c99ca76ef4ab..4c5fcdc810a4 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -429,7 +429,7 @@ sal_Bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::un
bRet = aImport.Import(sal_True, nError);
if ( nError )
- pLoadMedium->SetError( nError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ pLoadMedium->SetError( nError, OUString( OSL_LOG_PREFIX ) );
//if the document was not generated by LibreOffice, do hard recalc in case some other document
//generator saved cached formula results that differ from LibreOffice's calculated results or
@@ -561,10 +561,10 @@ sal_Bool ScDocShell::Load( SfxMedium& rMedium )
}
if (!bRet && !rMedium.GetError())
- rMedium.SetError( SVSTREAM_FILEFORMAT_ERROR, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ rMedium.SetError( SVSTREAM_FILEFORMAT_ERROR, OUString( OSL_LOG_PREFIX ) );
if (rMedium.GetError())
- SetError( rMedium.GetError(), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError( rMedium.GetError(), OUString( OSL_LOG_PREFIX ) );
InitItems();
CalcOutputFactor();
@@ -904,7 +904,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
if ( !bSuccess )
- SetError( ERRCODE_IO_ABORT, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // this error code will produce no error message, but will break the further saving process
+ SetError( ERRCODE_IO_ABORT, OUString( OSL_LOG_PREFIX ) ); // this error code will produce no error message, but will break the further saving process
}
#endif
@@ -921,7 +921,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
if( RET_NO == aBox.Execute())
{
- SetError( ERRCODE_IO_ABORT, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // this error code will produce no error message, but will break the further saving process
+ SetError( ERRCODE_IO_ABORT, OUString( OSL_LOG_PREFIX ) ); // this error code will produce no error message, but will break the further saving process
}
}
} // fall through
@@ -1062,7 +1062,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (eError != eERR_OK)
{
if (!GetError())
- SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError(eError, OUString( OSL_LOG_PREFIX ));
}
else
bRet = sal_True;
@@ -1091,7 +1091,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (eError != eERR_OK)
{
if (!GetError())
- SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError(eError, OUString( OSL_LOG_PREFIX ));
if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
bRet = sal_True;
@@ -1128,13 +1128,13 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (eError == SCWARN_IMPORT_RANGE_OVERFLOW)
{
if (!GetError())
- SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError(eError, OUString( OSL_LOG_PREFIX ));
bRet = sal_True;
}
else if (eError != eERR_OK)
{
if (!GetError())
- SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError(eError, OUString( OSL_LOG_PREFIX ));
}
else
bRet = true;
@@ -1194,7 +1194,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (eError != eERR_OK)
{
if (!GetError())
- SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError(eError, OUString( OSL_LOG_PREFIX ));
}
else if (!GetError() && (bOverflowRow || bOverflowCol || bOverflowCell))
{
@@ -1202,7 +1202,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
FltError nWarn = (bOverflowRow ? SCWARN_IMPORT_ROW_OVERFLOW :
(bOverflowCol ? SCWARN_IMPORT_COLUMN_OVERFLOW :
SCWARN_IMPORT_CELL_OVERFLOW));
- SetError( nWarn, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError( nWarn, OUString( OSL_LOG_PREFIX ));
}
bSetColWidths = sal_True;
bSetSimpleTextColWidths = sal_True;
@@ -1234,7 +1234,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (eError != eERR_OK)
{
if (!GetError())
- SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError(eError, OUString( OSL_LOG_PREFIX ));
bRet = ( eError == SCWARN_IMPORT_RANGE_OVERFLOW );
}
else
@@ -1272,7 +1272,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (eError != eERR_OK)
{
if (!GetError())
- SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError(eError, OUString( OSL_LOG_PREFIX ));
if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
bRet = sal_True;
@@ -1307,7 +1307,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
}
if ( eError != eERR_OK && !GetError() )
- SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError(eError, OUString( OSL_LOG_PREFIX ));
bSetColWidths = sal_True;
bSetSimpleTextColWidths = sal_True;
bSetRowHeights = sal_True;
@@ -1318,7 +1318,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (eError != eERR_OK)
{
if (!GetError())
- SetError( eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError( eError, OUString( OSL_LOG_PREFIX ) );
if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
bRet = sal_True;
}
@@ -1344,7 +1344,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (eError != eERR_OK)
{
if (!GetError())
- SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError(eError, OUString( OSL_LOG_PREFIX ));
if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
bRet = sal_True;
@@ -1363,7 +1363,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
}
if ( eError != eERR_OK && !GetError() )
- SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError(eError, OUString( OSL_LOG_PREFIX ));
}
else if (aFltName.EqualsAscii(pFilterHtml) || aFltName.EqualsAscii(pFilterHtmlWebQ))
{
@@ -1395,7 +1395,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (eError != eERR_OK)
{
if (!GetError())
- SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError(eError, OUString( OSL_LOG_PREFIX ));
if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
bRet = sal_True;
@@ -1412,12 +1412,12 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
}
if ( eError != eERR_OK && !GetError() )
- SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError(eError, OUString( OSL_LOG_PREFIX ));
}
else
{
if (!GetError())
- SetError(SCERR_IMPORT_NI, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError(SCERR_IMPORT_NI, OUString( OSL_LOG_PREFIX ));
}
if (!bCalc3)
@@ -2228,7 +2228,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed )
FltError eError = ScFormatFilter::Get().ScExportExcel5( rMed, &aDocument, eFormat, RTL_TEXTENCODING_MS_1252 );
if( eError && !GetError() )
- SetError( eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError( eError, OUString( OSL_LOG_PREFIX ) );
// don't return false for warnings
bRet = ((eError & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK) || (eError == eERR_OK);
@@ -2236,7 +2236,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed )
else
{
// export aborted, i.e. "Save without password" warning
- SetError( ERRCODE_ABORT, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError( ERRCODE_ABORT, OUString( OSL_LOG_PREFIX ) );
}
}
else if (aFltName.EqualsAscii(pFilterAscii))
@@ -2269,7 +2269,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed )
if (aDocument.GetTableCount() > 1)
if (!rMed.GetError())
- rMed.SetError(SCWARN_EXPORT_ASCII, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ rMed.SetError(SCWARN_EXPORT_ASCII, OUString( OSL_LOG_PREFIX ));
}
}
else if (aFltName.EqualsAscii(pFilterDBase))
@@ -2310,7 +2310,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed )
if ( eError != eERR_OK )
{
if (!GetError())
- SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError(eError, OUString( OSL_LOG_PREFIX ));
if ( bHasMemo && IsDocument( aTmpFile ) )
KillFile( aTmpFile );
}
@@ -2331,7 +2331,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed )
{
KillFile( aTmpFile );
if ( !GetError() )
- SetError( SCERR_EXPORT_DATA, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError( SCERR_EXPORT_DATA, OUString( OSL_LOG_PREFIX ) );
}
}
}
@@ -2365,7 +2365,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed )
if (aDocument.GetTableCount() > 1)
if (!rMed.GetError())
- rMed.SetError(SCWARN_EXPORT_ASCII, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ rMed.SetError(SCWARN_EXPORT_ASCII, OUString( OSL_LOG_PREFIX ));
}
}
else if (aFltName.EqualsAscii(pFilterSylk))
@@ -2398,13 +2398,13 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed )
SetError( *new StringErrorInfo(
SCWARN_EXPORT_NONCONVERTIBLE_CHARS,
aImExport.GetNonConvertibleChars(),
- ERRCODE_BUTTON_OK | ERRCODE_MSG_INFO ), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ ERRCODE_BUTTON_OK | ERRCODE_MSG_INFO ), OUString( OSL_LOG_PREFIX ) );
}
}
else
{
if (GetError())
- SetError(SCERR_IMPORT_NI, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError(SCERR_IMPORT_NI, OUString( OSL_LOG_PREFIX ) );
}
return bRet;
}
generated by cgit (git 2.34.1) at 2024-07-16 04:20:52 +0000