diff options
Diffstat (limited to 'sc/source/ui/docshell/docsh.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 150 |
1 files changed, 75 insertions, 75 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 45bb6ae53e26..16942554d809 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -200,7 +200,7 @@ void ScDocShell::FillClass( SvGlobalName* pClassName, { *pClassName = SvGlobalName( SO3_SC_CLASSID_60 ); *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARCALC_8_TEMPLATE : SOT_FORMATSTR_ID_STARCALC_8; - *pFullTypeName = rtl::OUString("calc8"); + *pFullTypeName = OUString("calc8"); *pShortTypeName = ScResId(SCSTR_SHORT_SCDOC_NAME).toString(); } else @@ -294,9 +294,9 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet) { if (aDocument.IsLinked( i )) { - rtl::OUString aName; + OUString aName; aDocument.GetName(i, aName); - rtl::OUString aLinkTabName = aDocument.GetLinkTab(i); + OUString aLinkTabName = aDocument.GetLinkTab(i); sal_Int32 nLinkTabNameLength = aLinkTabName.getLength(); sal_Int32 nNameLength = aName.getLength(); if (nLinkTabNameLength < nNameLength) @@ -307,7 +307,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet) if ( *pNameBuffer == '\'' && // all docnames have to have a ' character on the first pos ScGlobal::UnicodeStrChr( pNameBuffer, SC_COMPILER_FILE_TAB_SEP ) ) { - rtl::OUStringBuffer aDocURLBuffer; + OUStringBuffer aDocURLBuffer; sal_Bool bQuote = sal_True; // Dokumentenname ist immer quoted ++pNameBuffer; while ( bQuote && *pNameBuffer ) @@ -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, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + pLoadMedium->SetError( nError, OUString( RTL_CONSTASCII_USTRINGPARAM( 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, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + rMedium.SetError( SVSTREAM_FILEFORMAT_ERROR, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); if (rMedium.GetError()) - SetError( rMedium.GetError(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( rMedium.GetError(), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); InitItems(); CalcOutputFactor(); @@ -690,7 +690,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::UNO_QUERY_THROW ); uno::Reference< container::XContentEnumerationAccess > xEnumAccess( xServiceManager, uno::UNO_QUERY_THROW ); uno::Reference< container::XEnumeration> xEnum = xEnumAccess->createContentEnumeration( - ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocumentJob" ) ); + OUString( "com.sun.star.sheet.SpreadsheetDocumentJob" ) ); if ( xEnum.is() ) { while ( xEnum->hasMoreElements() ) @@ -708,7 +708,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) SfxFrame* pFrame = ( pViewFrame ? &pViewFrame->GetFrame() : NULL ); uno::Reference< frame::XController > xController = ( pFrame ? pFrame->GetController() : 0 ); uno::Reference< sheet::XSpreadsheetView > xSpreadsheetView( xController, uno::UNO_QUERY_THROW ); - aArgsForJob[0] = beans::NamedValue( ::rtl::OUString( "SpreadsheetView" ), + aArgsForJob[0] = beans::NamedValue( OUString( "SpreadsheetView" ), uno::makeAny( xSpreadsheetView ) ); xJob->execute( aArgsForJob ); } @@ -772,7 +772,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) try { ::svt::DocumentLockFile aLockFile( GetSharedFileURL() ); - uno::Sequence< ::rtl::OUString > aData = aLockFile.GetLockData(); + uno::Sequence< OUString > aData = aLockFile.GetLockData(); if ( aData.getLength() > LOCKFILE_SYSUSERNAME_ID ) { if ( !aData[LOCKFILE_OOOUSERNAME_ID].isEmpty() ) @@ -837,8 +837,8 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Reference< frame::XStorable > xStor( GetModel(), uno::UNO_QUERY_THROW ); // TODO/LATER: More entries from the MediaDescriptor might be interesting for the merge uno::Sequence< beans::PropertyValue > aValues(1); - aValues[0].Name = ::rtl::OUString( "FilterName"); - aValues[0].Value <<= ::rtl::OUString( GetMedium()->GetFilter()->GetFilterName() ); + aValues[0].Name = OUString( "FilterName"); + aValues[0].Value <<= OUString( GetMedium()->GetFilter()->GetFilterName() ); SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false); if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() ) @@ -904,7 +904,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) } if ( !bSuccess ) - SetError( ERRCODE_IO_ABORT, ::rtl::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( RTL_CONSTASCII_USTRINGPARAM( 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, ::rtl::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( RTL_CONSTASCII_USTRINGPARAM( 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, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( 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, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( 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, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); bRet = sal_True; } else if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } else bRet = true; @@ -1159,7 +1159,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) // ISO8859-1/MS_1252 encoding, comma, double quotes aOptions.SetCharSet( RTL_TEXTENCODING_MS_1252 ); - aOptions.SetFieldSeps( rtl::OUString(',') ); + aOptions.SetFieldSeps( OUString(',') ); aOptions.SetTextSep( '"' ); } @@ -1194,7 +1194,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( 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, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError( nWarn, OUString( RTL_CONSTASCII_USTRINGPARAM( 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, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( 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, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( 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, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( 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, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( eError, OUString( RTL_CONSTASCII_USTRINGPARAM( 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, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( 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, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( 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, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( 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, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } else { if (!GetError()) - SetError(SCERR_IMPORT_NI, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(SCERR_IMPORT_NI, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } if (!bCalc3) @@ -1664,16 +1664,16 @@ sal_Int32 lcl_ScDocShell_GetColWidthInChars( sal_uInt16 nWidth ) } -void lcl_ScDocShell_GetFixedWidthString( rtl::OUString& rStr, const ScDocument& rDoc, +void lcl_ScDocShell_GetFixedWidthString( OUString& rStr, const ScDocument& rDoc, SCTAB nTab, SCCOL nCol, sal_Bool bValue, SvxCellHorJustify eHorJust ) { - rtl::OUString aString = rStr; + OUString aString = rStr; sal_Int32 nLen = lcl_ScDocShell_GetColWidthInChars( rDoc.GetColWidth( nCol, nTab ) ); //If the text won't fit in the column if ( nLen < aString.getLength() ) { - rtl::OUStringBuffer aReplacement; + OUStringBuffer aReplacement; if (bValue) aReplacement.appendAscii(RTL_CONSTASCII_STRINGPARAM("###")); else @@ -1691,7 +1691,7 @@ void lcl_ScDocShell_GetFixedWidthString( rtl::OUString& rStr, const ScDocument& { case SVX_HOR_JUSTIFY_RIGHT: { - rtl::OUStringBuffer aTmp; + OUStringBuffer aTmp; aTmp = comphelper::string::padToLength( aTmp, nBlanks, ' ' ); aString = aTmp.append(aString).makeStringAndClear(); } @@ -1699,7 +1699,7 @@ void lcl_ScDocShell_GetFixedWidthString( rtl::OUString& rStr, const ScDocument& case SVX_HOR_JUSTIFY_CENTER: { sal_Int32 nLeftPad = nBlanks / 2; - rtl::OUStringBuffer aTmp; + OUStringBuffer aTmp; comphelper::string::padToLength( aTmp, nLeftPad, ' ' ); aTmp.append(aString); comphelper::string::padToLength( aTmp, nLen, ' ' ); @@ -1708,7 +1708,7 @@ void lcl_ScDocShell_GetFixedWidthString( rtl::OUString& rStr, const ScDocument& break; default: { - rtl::OUStringBuffer aTmp(aString); + OUStringBuffer aTmp(aString); comphelper::string::padToLength( aTmp, nLen, ' ' ); aString = aTmp.makeStringAndClear(); } @@ -1721,7 +1721,7 @@ void lcl_ScDocShell_GetFixedWidthString( rtl::OUString& rStr, const ScDocument& void lcl_ScDocShell_WriteEmptyFixedWidthString( SvStream& rStream, const ScDocument& rDoc, SCTAB nTab, SCCOL nCol ) { - rtl::OUString aString; + OUString aString; lcl_ScDocShell_GetFixedWidthString( aString, rDoc, nTab, nCol, false, SVX_HOR_JUSTIFY_STANDARD ); rStream.WriteUnicodeOrByteText( aString ); @@ -1766,10 +1766,10 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt CharSet eOldCharSet = rStream.GetStreamCharSet(); rStream.SetStreamCharSet( eCharSet ); sal_uInt16 nOldNumberFormatInt = rStream.GetNumberFormatInt(); - rtl::OString aStrDelimEncoded; // only used if not Unicode - rtl::OUString aStrDelimDecoded; // only used if context encoding - rtl::OString aDelimEncoded; - rtl::OUString aDelimDecoded; + OString aStrDelimEncoded; // only used if not Unicode + OUString aStrDelimDecoded; // only used if context encoding + OString aDelimEncoded; + OUString aDelimDecoded; bool bContextOrNotAsciiEncoding; if ( eCharSet == RTL_TEXTENCODING_UNICODE ) { @@ -1778,8 +1778,8 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt } else { - aStrDelimEncoded = rtl::OString(&cStrDelim, 1, eCharSet); - aDelimEncoded = rtl::OString(&cDelim, 1, eCharSet); + aStrDelimEncoded = OString(&cStrDelim, 1, eCharSet); + aDelimEncoded = OString(&cDelim, 1, eCharSet); rtl_TextEncodingInfo aInfo; aInfo.StructSize = sizeof(aInfo); if ( rtl_getTextEncodingInfo( eCharSet, &aInfo ) ) @@ -1789,8 +1789,8 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt ((aInfo.Flags & RTL_TEXTENCODING_INFO_ASCII) == 0)); if ( bContextOrNotAsciiEncoding ) { - aStrDelimDecoded = rtl::OStringToOUString(aStrDelimEncoded, eCharSet); - aDelimDecoded = rtl::OStringToOUString(aDelimEncoded, eCharSet); + aStrDelimDecoded = OStringToOUString(aStrDelimEncoded, eCharSet); + aDelimDecoded = OStringToOUString(aDelimEncoded, eCharSet); } } else @@ -1806,7 +1806,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt ScProgress aProgress( this, ScGlobal::GetRscString( STR_SAVE_DOC ), nEndRow ); - rtl::OUString aString; + OUString aString; bool bTabProtect = aDocument.IsTabProtected( nTab ); @@ -1896,7 +1896,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt { case CELLTYPE_NOTE: case CELLTYPE_NONE: - aString = rtl::OUString(); + aString = OUString(); bString = false; break; case CELLTYPE_FORMULA : @@ -1980,7 +1980,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt break; default: OSL_FAIL( "ScDocShell::AsciiSave: unknown CellType" ); - aString = rtl::OUString(); + aString = OUString(); bString = false; } @@ -1995,7 +1995,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt } else { - rtl::OUString aUniString = aString;//remove that later + OUString aUniString = aString;//remove that later if (!bString && cStrDelim != 0 && !aUniString.isEmpty()) { sal_Unicode c = aUniString[0]; @@ -2015,8 +2015,8 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt sal_Int32 nPos = getTextSepPos( aUniString, rAsciiOpt, cStrDelim, cDelim, bNeedQuotes); - escapeTextSep<rtl::OUString, rtl::OUStringBuffer>( - nPos, rtl::OUString(cStrDelim), aUniString); + escapeTextSep<OUString, OUStringBuffer>( + nPos, OUString(cStrDelim), aUniString); if ( bNeedQuotes ) rStream.WriteUniOrByteChar( cStrDelim, eCharSet ); @@ -2043,16 +2043,16 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt if ( bContextOrNotAsciiEncoding ) { // to byte encoding - rtl::OString aStrEnc = rtl::OUStringToOString(aUniString, eCharSet); + OString aStrEnc = OUStringToOString(aUniString, eCharSet); // back to Unicode - rtl::OUString aStrDec = rtl::OStringToOUString(aStrEnc, eCharSet); + OUString aStrDec = OStringToOUString(aStrEnc, eCharSet); // search on re-decoded string bool bNeedQuotes = false; sal_Int32 nPos = getTextSepPos( aStrDec, rAsciiOpt, aStrDelimDecoded, aDelimDecoded, bNeedQuotes); - escapeTextSep<rtl::OUString, rtl::OUStringBuffer>( + escapeTextSep<OUString, OUStringBuffer>( nPos, aStrDelimDecoded, aStrDec); // write byte re-encoded @@ -2064,14 +2064,14 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt } else { - rtl::OString aStrEnc = rtl::OUStringToOString(aUniString, eCharSet); + OString aStrEnc = OUStringToOString(aUniString, eCharSet); // search on encoded string bool bNeedQuotes = false; sal_Int32 nPos = getTextSepPos( aStrEnc, rAsciiOpt, aStrDelimEncoded, aDelimEncoded, bNeedQuotes); - escapeTextSep<rtl::OString, rtl::OStringBuffer>( + escapeTextSep<OString, OStringBuffer>( nPos, aStrDelimEncoded, aStrEnc); // write byte encoded @@ -2205,7 +2205,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) FltError eError = ScFormatFilter::Get().ScExportExcel5( rMed, &aDocument, eFormat, RTL_TEXTENCODING_MS_1252 ); if( eError && !GetError() ) - SetError( eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // don't return false for warnings bRet = ((eError & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK) || (eError == eERR_OK); @@ -2213,7 +2213,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) else { // export aborted, i.e. "Save without password" warning - SetError( ERRCODE_ABORT, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( ERRCODE_ABORT, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } } else if (aFltName.EqualsAscii(pFilterAscii)) @@ -2246,7 +2246,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) if (aDocument.GetTableCount() > 1) if (!rMed.GetError()) - rMed.SetError(SCWARN_EXPORT_ASCII, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + rMed.SetError(SCWARN_EXPORT_ASCII, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } } else if (aFltName.EqualsAscii(pFilterDBase)) @@ -2283,11 +2283,11 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) INetURLObject aTmpFile( rMed.GetPhysicalName(), INET_PROT_FILE ); if ( bHasMemo ) - aTmpFile.setExtension(rtl::OUString("dbt")); + aTmpFile.setExtension(OUString("dbt")); if ( eError != eERR_OK ) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); if ( bHasMemo && IsDocument( aTmpFile ) ) KillFile( aTmpFile ); } @@ -2299,7 +2299,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) SfxStringItem* pNameItem = (SfxStringItem*) rMed.GetItemSet()->GetItem( SID_FILE_NAME ); INetURLObject aDbtFile( pNameItem->GetValue(), INET_PROT_FILE ); - aDbtFile.setExtension(rtl::OUString("dbt")); + aDbtFile.setExtension(OUString("dbt")); if ( IsDocument( aDbtFile ) && !KillFile( aDbtFile ) ) bRet = false; if ( bRet && !MoveFile( aTmpFile, aDbtFile ) ) @@ -2308,7 +2308,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) { KillFile( aTmpFile ); if ( !GetError() ) - SetError( SCERR_EXPORT_DATA, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( SCERR_EXPORT_DATA, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } } } @@ -2342,7 +2342,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) if (aDocument.GetTableCount() > 1) if (!rMed.GetError()) - rMed.SetError(SCWARN_EXPORT_ASCII, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + rMed.SetError(SCWARN_EXPORT_ASCII, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } } else if (aFltName.EqualsAscii(pFilterSylk)) @@ -2375,13 +2375,13 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) SetError( *new StringErrorInfo( SCWARN_EXPORT_NONCONVERTIBLE_CHARS, aImExport.GetNonConvertibleChars(), - ERRCODE_BUTTON_OK | ERRCODE_MSG_INFO ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + ERRCODE_BUTTON_OK | ERRCODE_MSG_INFO ), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } } else { if (GetError()) - SetError(SCERR_IMPORT_NI, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError(SCERR_IMPORT_NI, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } return bRet; } @@ -2511,37 +2511,37 @@ void ScDocShell::PrepareReload() String ScDocShell::GetOwnFilterName() { - return rtl::OUString(pFilterSc50); + return OUString(pFilterSc50); } String ScDocShell::GetHtmlFilterName() { - return rtl::OUString(pFilterHtml); + return OUString(pFilterHtml); } String ScDocShell::GetWebQueryFilterName() { - return rtl::OUString(pFilterHtmlWebQ); + return OUString(pFilterHtmlWebQ); } String ScDocShell::GetAsciiFilterName() { - return rtl::OUString(pFilterAscii); + return OUString(pFilterAscii); } String ScDocShell::GetLotusFilterName() { - return rtl::OUString(pFilterLotus); + return OUString(pFilterLotus); } String ScDocShell::GetDBaseFilterName() { - return rtl::OUString(pFilterDBase); + return OUString(pFilterDBase); } String ScDocShell::GetDifFilterName() { - return rtl::OUString(pFilterDif); + return OUString(pFilterDif); } sal_Bool ScDocShell::HasAutomaticTableName( const String& rFilter ) @@ -2578,7 +2578,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) : SfxObjectShell( rShell.GetCreateMode() ), SfxListener(), aDocument ( SCDOCMODE_DOCUMENT, this ), - aDdeTextFmt(rtl::OUString("TEXT")), + aDdeTextFmt(OUString("TEXT")), nPrtToScreenFactor( 1.0 ), pImpl ( new DocShell_Impl ), bHeaderOn ( true ), @@ -2627,7 +2627,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) : ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) : SfxObjectShell( i_nSfxCreationFlags ), aDocument ( SCDOCMODE_DOCUMENT, this ), - aDdeTextFmt(rtl::OUString("TEXT")), + aDdeTextFmt(OUString("TEXT")), nPrtToScreenFactor( 1.0 ), pImpl ( new DocShell_Impl ), bHeaderOn ( true ), |