From bccf34c19ae022b67565e212fa4ec0d5213947de Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 2 Jul 2012 16:02:38 +0100 Subject: ditch String::CreateFromAscii Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691 --- sc/source/core/data/dptabres.cxx | 12 ++++++------ sc/source/core/data/global.cxx | 2 +- sc/source/core/tool/addincol.cxx | 2 +- sc/source/core/tool/cellkeytranslator.cxx | 10 +++++----- sc/source/core/tool/compiler.cxx | 16 ++++++++-------- sc/source/core/tool/defaultsoptions.cxx | 2 +- sc/source/core/tool/formulaopt.cxx | 2 +- sc/source/core/tool/printopt.cxx | 2 +- sc/source/filter/excel/xechart.cxx | 2 +- sc/source/filter/html/htmlpars.cxx | 8 ++++---- sc/source/ui/app/inputhdl.cxx | 2 +- sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 4 ++-- sc/source/ui/dbgui/asciiopt.cxx | 4 ++-- sc/source/ui/docshell/docfunc.cxx | 2 +- sc/source/ui/docshell/docsh.cxx | 14 +++++++------- sc/source/ui/docshell/docsh4.cxx | 2 +- sc/source/ui/docshell/docsh8.cxx | 2 +- sc/source/ui/docshell/tablink.cxx | 2 +- sc/source/ui/miscdlgs/instbdlg.cxx | 2 +- sc/source/ui/miscdlgs/linkarea.cxx | 2 +- sc/source/ui/unoobj/scdetect.cxx | 28 ++++++++++++++-------------- sc/source/ui/unoobj/styleuno.cxx | 14 +++++++------- sc/source/ui/vba/excelvbahelper.cxx | 2 +- sc/source/ui/vba/vbanames.cxx | 4 ++-- sc/source/ui/view/viewfun4.cxx | 2 +- 25 files changed, 72 insertions(+), 72 deletions(-) (limited to 'sc') diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index d3db1453b31c..8a2e30e1d2a2 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -1780,7 +1780,7 @@ void ScDPResultMember::UpdateRunningTotals( const ScDPResultMember* pRefMember, void ScDPResultMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - lcl_DumpRow( String::CreateFromAscii("ScDPResultMember"), GetName(), NULL, pDoc, rPos ); + lcl_DumpRow( rtl::OUString("ScDPResultMember"), GetName(), NULL, pDoc, rPos ); SCROW nStartRow = rPos.Row(); if (pDataRoot) @@ -2619,7 +2619,7 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember, void ScDPDataMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - lcl_DumpRow( String::CreateFromAscii("ScDPDataMember"), GetName(), &aAggregate, pDoc, rPos ); + lcl_DumpRow( rtl::OUString("ScDPDataMember"), GetName(), &aAggregate, pDoc, rPos ); SCROW nStartRow = rPos.Row(); const ScDPDataDimension* pDataChild = GetChildDimension(); @@ -3427,8 +3427,8 @@ ScDPDataMember* ScDPResultDimension::GetColReferenceMember( const ScDPRelativePo void ScDPResultDimension::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - String aDimName = bIsDataLayout ? String::CreateFromAscii("(data layout)") : GetName(); - lcl_DumpRow( String::CreateFromAscii("ScDPResultDimension"), aDimName, NULL, pDoc, rPos ); + rtl::OUString aDimName = bIsDataLayout ? rtl::OUString("(data layout)") : rtl::OUString(GetName()); + lcl_DumpRow( rtl::OUString("ScDPResultDimension"), aDimName, NULL, pDoc, rPos ); SCROW nStartRow = rPos.Row(); @@ -3787,8 +3787,8 @@ void ScDPDataDimension::UpdateRunningTotals( const ScDPResultDimension* pRefDim, void ScDPDataDimension::DumpState( const ScDPResultDimension* pRefDim, ScDocument* pDoc, ScAddress& rPos ) const { - String aDimName = String::CreateFromAscii( bIsDataLayout ? "(data layout)" : "(unknown)" ); - lcl_DumpRow( String::CreateFromAscii("ScDPDataDimension"), aDimName, NULL, pDoc, rPos ); + rtl::OUString aDimName = bIsDataLayout ? rtl::OUString("(data layout)") : rtl::OUString("(unknown)"); + lcl_DumpRow( rtl::OUString("ScDPDataDimension"), aDimName, NULL, pDoc, rPos ); SCROW nStartRow = rPos.Row(); diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index b646b6f29671..ee2bea9e45b0 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -729,7 +729,7 @@ String ScGlobal::GetCharsetString( CharSet eVal ) default: return String::CreateFromInt32( eVal ); } - return String::CreateFromAscii(pChar); + return rtl::OUString::createFromAscii(pChar); } //------------------------------------------------------------------------ diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 6afbb558f3a7..0a5f08b97603 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -1164,7 +1164,7 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::ReferenceaDescription; } else - aDesc.aName = aDesc.aDescription = String::CreateFromAscii( "###" ); + aDesc.aName = aDesc.aDescription = rtl::OUString("###"); sal_Bool bOptional = ( eArgType == SC_ADDINARG_VALUE_OR_ARRAY || diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx index f32234c6fba8..ea63b57e6204 100644 --- a/sc/source/core/tool/cellkeytranslator.cxx +++ b/sc/source/core/tool/cellkeytranslator.cxx @@ -93,7 +93,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, { // Since no locale nor opcode matching is needed, simply return // the first item on the list. - rName = String::CreateFromAscii( itr->second.front().mpName ); + rName = rtl::OUString::createFromAscii( itr->second.front().mpName ); return; } @@ -113,7 +113,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, if ( eLevel == LOCALE_MATCH_ALL ) { // Name with matching opcode and locale found. - rName = String::CreateFromAscii( itrList->mpName ); + rName = rtl::OUString::createFromAscii( itrList->mpName ); return; } else if ( eLevel > eLocaleMatchLevel ) @@ -134,7 +134,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, if ( itrList->meOpCode == eOpCode ) { // Name with a matching opcode preferred. - rName = String::CreateFromAscii( itrList->mpName ); + rName = rtl::OUString::createFromAscii( itrList->mpName ); return; } } @@ -144,7 +144,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, if ( eLevel == LOCALE_MATCH_ALL ) { // Name with matching locale preferred. - rName = String::CreateFromAscii( itrList->mpName ); + rName = rtl::OUString::createFromAscii( itrList->mpName ); return; } else if ( eLevel > eLocaleMatchLevel ) @@ -157,7 +157,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, } // No preferred strings found. Return the best matching name. - rName = String::CreateFromAscii(aBestMatchName); + rName = rtl::OUString::createFromAscii(aBestMatchName); } void ScCellKeywordTranslator::transKeyword(String& rName, const Locale* pLocale, OpCode eOpCode) diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index dc30ff812805..6a3aa146a32b 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -136,8 +136,8 @@ void ScCompiler::fillFromAddInMap( NonConstOpCodeMapPtr xMap,FormulaGrammar::Gra char const * const * ppSymbol = reinterpret_cast< char const * const * >( reinterpret_cast< char const * >(pMap) + nSymbolOffset); - xMap->putExternal( String::CreateFromAscii( *ppSymbol), - String::CreateFromAscii( pMap->pOriginal)); + xMap->putExternal( rtl::OUString::createFromAscii( *ppSymbol), + rtl::OUString::createFromAscii( pMap->pOriginal)); } } @@ -713,7 +713,7 @@ struct Convention_A1 : public ScCompiler::Convention KParseTokens::ASC_UNDERSCORE | KParseTokens::ASC_DOLLAR; static const sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT; // '?' allowed in range names because of Xcl :-/ - static const String aAddAllowed(String::CreateFromAscii("?#")); + static const String aAddAllowed(rtl::OUString("?#")); return pCharClass->parseAnyToken( rFormula, nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed ); } @@ -902,7 +902,7 @@ struct ConventionOOO_A1 : public Convention_A1 else aFile = INetURLObject::decode(*p, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS); } - aFile.SearchAndReplaceAllAscii("'", String::CreateFromAscii("''")); + aFile.SearchAndReplaceAllAscii("'", rtl::OUString("''")); rBuffer.append(sal_Unicode('\'')); rBuffer.append(aFile); @@ -1372,7 +1372,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL KParseTokens::ASC_UNDERSCORE | KParseTokens::ASC_DOLLAR; static const sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT; // '?' allowed in range names - static const String aAddAllowed = String::CreateFromAscii("?!"); + const rtl::OUString aAddAllowed("?!"); return pCharClass->parseAnyToken( rFormula, nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed ); } @@ -1577,7 +1577,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL KParseTokens::ASC_UNDERSCORE ; static const sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT; // '?' allowed in range names - static const String aAddAllowed = String::CreateFromAscii( "?-[]!" ); + const rtl::OUString aAddAllowed("?-[]!"); return pCharClass->parseAnyToken( rFormula, nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed ); @@ -1750,8 +1750,8 @@ void ScCompiler::CheckTabQuotes( String& rString, case FormulaGrammar::CONV_XL_OOX : if( bNeedsQuote ) { - static const String one_quote = static_cast( '\'' ); - static const String two_quote = String::CreateFromAscii( "''" ); + const rtl::OUString one_quote(static_cast('\'')); + const rtl::OUString two_quote("''"); // escape embedded quotes rString.SearchAndReplaceAll( one_quote, two_quote ); } diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index 9683a7affd57..9c3e39d781b2 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -105,7 +105,7 @@ ScTpDefaultsItem::~ScTpDefaultsItem() String ScTpDefaultsItem::GetValueText() const { - return String::CreateFromAscii( "ScTpDefaultsItem" ); + return rtl::OUString("ScTpDefaultsItem"); } int ScTpDefaultsItem::operator==( const SfxPoolItem& rItem ) const diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index 739758bdb96a..7cb1687ea26e 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -187,7 +187,7 @@ ScTpFormulaItem::~ScTpFormulaItem() String ScTpFormulaItem::GetValueText() const { - return String::CreateFromAscii( "ScTpFormulaItem" ); + return rtl::OUString("ScTpFormulaItem"); } int ScTpFormulaItem::operator==( const SfxPoolItem& rItem ) const diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index 7ae0d28cac27..a6efc8f31bb4 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -103,7 +103,7 @@ ScTpPrintItem::~ScTpPrintItem() String ScTpPrintItem::GetValueText() const { - return String::CreateFromAscii( "ScTpPrintItem" ); + return rtl::OUString("ScTpPrintItem"); } int ScTpPrintItem::operator==( const SfxPoolItem& rItem ) const diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index f044f5439d53..d5ea624983c5 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -1237,7 +1237,7 @@ void XclExpChText::ConvertTitle( Reference< XTitle > xTitle, sal_uInt16 nTarget, if (pSubTitle) { // append subtitle as the 2nd line of the title. - String aSubTitle = String::CreateFromAscii("\n"); + String aSubTitle = rtl::OUString("\n"); aSubTitle.Append(*pSubTitle); mxSrcLink->AppendString(aSubTitle); } diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index f7ee76821fc1..cde5dd1f6de2 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -308,11 +308,11 @@ sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const String& rBaseURL ) const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 ); if( pCharSet ) { - String aContentType = String::CreateFromAscii( "text/html; charset=" ); + String aContentType = rtl::OUString( "text/html; charset=" ); aContentType.AppendAscii( pCharSet ); xValues = new SvKeyValueIterator; - xValues->Append( SvKeyValue( String::CreateFromAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); + xValues->Append( SvKeyValue( rtl::OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); pAttributes = xValues; } } @@ -2956,11 +2956,11 @@ sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const String& rBaseURL ) const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 ); if( pCharSet ) { - String aContentType = String::CreateFromAscii( "text/html; charset=" ); + String aContentType = rtl::OUString( "text/html; charset=" ); aContentType.AppendAscii( pCharSet ); xValues = new SvKeyValueIterator; - xValues->Append( SvKeyValue( String::CreateFromAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); + xValues->Append( SvKeyValue( rtl::OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); pAttributes = xValues; } } diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 75a577bddbd0..8ea50a312820 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -209,7 +209,7 @@ void ScInputHandler::InitRangeFinder( const String& rFormula ) return; String aDelimiters = ScEditUtil::ModifyDelimiters( - String::CreateFromAscii( pMinDelimiters ) ); + rtl::OUString::createFromAscii( pMinDelimiters ) ); xub_StrLen nColon = aDelimiters.Search(':'); if ( nColon != STRING_NOTFOUND ) diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 4d2385ad90c4..29ded56fd475 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -323,7 +323,7 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScalingFactor" )); aArgs[0].Value = a; - SfxToolBoxControl::Dispatch( m_xDispatchProvider, String::CreateFromAscii(".uno:ScalingFactor"), aArgs ); + SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ScalingFactor"), aArgs ); mpImpl->mbOmitPaint = false; } @@ -363,7 +363,7 @@ void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScalingFactor" )); aArgs[0].Value = a; - SfxToolBoxControl::Dispatch( m_xDispatchProvider, String::CreateFromAscii(".uno:ScalingFactor"), aArgs ); + SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ScalingFactor"), aArgs ); mpImpl->mbOmitPaint = false; } diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index bf5ca0114ea5..4465b2b39813 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -394,11 +394,11 @@ String ScAsciiOptions::WriteToString() const aOutStr += ','; // Import quoted field as text. - aOutStr += String::CreateFromAscii(bQuotedFieldAsText ? "true" : "false"); + aOutStr += bQuotedFieldAsText ? rtl::OUString("true") : rtl::OUString("false"); aOutStr += ','; // Detect special nubmers. - aOutStr += String::CreateFromAscii(bDetectSpecialNumber ? "true" : "false"); + aOutStr += bDetectSpecialNumber ? rtl::OUString("true") : rtl::OUString("false"); // 9th token is used for "Save as shown" in export options // 10th token is used for "Save cell formulas" in export options diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index a7c7ab0015c3..bfc610710c99 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2649,7 +2649,7 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const rtl::OUString& sModul genModuleName = sModuleName; else { - genModuleName = String::CreateFromAscii( "Sheet1" ); + genModuleName = rtl::OUString( "Sheet1" ); nNum = 1; } while( xLib->hasByName( genModuleName ) ) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 7c9d0a4cf83e..153e17e76a62 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2455,37 +2455,37 @@ void ScDocShell::PrepareReload() String ScDocShell::GetOwnFilterName() { - return String::CreateFromAscii(pFilterSc50); + return rtl::OUString(pFilterSc50); } String ScDocShell::GetHtmlFilterName() { - return String::CreateFromAscii(pFilterHtml); + return rtl::OUString(pFilterHtml); } String ScDocShell::GetWebQueryFilterName() { - return String::CreateFromAscii(pFilterHtmlWebQ); + return rtl::OUString(pFilterHtmlWebQ); } String ScDocShell::GetAsciiFilterName() { - return String::CreateFromAscii(pFilterAscii); + return rtl::OUString(pFilterAscii); } String ScDocShell::GetLotusFilterName() { - return String::CreateFromAscii(pFilterLotus); + return rtl::OUString(pFilterLotus); } String ScDocShell::GetDBaseFilterName() { - return String::CreateFromAscii(pFilterDBase); + return rtl::OUString(pFilterDBase); } String ScDocShell::GetDifFilterName() { - return String::CreateFromAscii(pFilterDif); + return rtl::OUString(pFilterDif); } sal_Bool ScDocShell::HasAutomaticTableName( const String& rFilter ) diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 1f1211e3c847..dd572b4bab94 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -729,7 +729,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) pImpl->pRequest = new SfxRequest( rReq ); delete pImpl->pDocInserter; pImpl->pDocInserter = new ::sfx2::DocumentInserter( - String::CreateFromAscii( ScDocShell::Factory().GetShortName() ), 0 ); + rtl::OUString::createFromAscii( ScDocShell::Factory().GetShortName() ), 0 ); pImpl->pDocInserter->StartExecuteModal( LINK( this, ScDocShell, DialogClosedHdl ) ); return ; } diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index d42cf70fda91..d946a012db87 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -130,7 +130,7 @@ namespace // get connection - String aConnUrl = String::CreateFromAscii("sdbc:dbase:"); + String aConnUrl = rtl::OUString("sdbc:dbase:"); aConnUrl += aPath; svxform::ODataAccessCharsetHelper aHelper; diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 3ea9de72310d..888df91567e3 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -496,7 +496,7 @@ bool ScDocumentLoader::GetFilterName( const String& rFileName, if ( bWithInteraction ) pMedium->UseInteractionHandler(true); // #i73992# no longer called from GuessFilter - SfxFilterMatcher aMatcher( String::CreateFromAscii("scalc") ); + SfxFilterMatcher aMatcher( rtl::OUString("scalc") ); if( bWithContent ) aMatcher.GuessFilter( *pMedium, &pSfxFilter ); else diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 03119c05187b..11439beed8fa 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -315,7 +315,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl) if ( pDocInserter ) delete pDocInserter; pDocInserter = new ::sfx2::DocumentInserter( - String::CreateFromAscii( ScDocShell::Factory().GetShortName() ) ); + rtl::OUString::createFromAscii( ScDocShell::Factory().GetShortName() ) ); pDocInserter->StartExecuteModal( LINK( this, ScInsertTableDlg, DialogClosedHdl ) ); return 0; } diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 234df1b5c273..aacf026aa81b 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -111,7 +111,7 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, BrowseHdl) { if ( !pDocInserter ) pDocInserter = new sfx2::DocumentInserter( - String::CreateFromAscii( ScDocShell::Factory().GetShortName() ) ); + rtl::OUString::createFromAscii( ScDocShell::Factory().GetShortName() ) ); pDocInserter->StartExecuteModal( LINK( this, ScLinkedAreaDlg, DialogClosedHdl ) ); return 0; } diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 43d0bb5f84c8..0e034c46a827 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -177,7 +177,7 @@ static const SfxFilter* lcl_DetectExcelXML( SvStream& rStream, SfxFilterMatcher& rtl::OString aFileString(reinterpret_cast(aBuffer), nBytesRead); if (aFileString.indexOf(aTryStr) >= 0) - pFound = rMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterExcelXML) ); + pFound = rMatcher.GetFilter4FilterName( rtl::OUString(pFilterExcelXML) ); } return pFound; @@ -323,18 +323,18 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) bWasReadOnly = pItem && pItem->GetValue(); const SfxFilter* pFilter = 0; - String aPrefix = String::CreateFromAscii( "private:factory/" ); + String aPrefix = rtl::OUString( "private:factory/" ); if( aURL.Match( aPrefix ) == aPrefix.Len() ) { String aPattern( aPrefix ); - aPattern += String::CreateFromAscii("scalc"); + aPattern += rtl::OUString("scalc"); if ( aURL.Match( aPattern ) >= aPattern.Len() ) pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL ); } else { // container for Calc filters - SfxFilterMatcher aMatcher( String::CreateFromAscii("scalc") ); + SfxFilterMatcher aMatcher( rtl::OUString("scalc") ); if ( aPreselectedFilterName.Len() ) pFilter = SfxFilter::GetFilterByName( aPreselectedFilterName ); else if( aTypeName.Len() ) @@ -435,7 +435,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) } if ( aTypeName.Len() ) - pFilter = SfxFilterMatcher( String::CreateFromAscii("scalc") ).GetFilter4EA( aTypeName ); + pFilter = SfxFilterMatcher( rtl::OUString("scalc") ).GetFilter4EA( aTypeName ); } } @@ -482,7 +482,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // we can simulate it by preserving the preselected filter if the type matches // example: Excel filters for Writer aOldName = pPreselectedFilter->GetFilterName(); - bIsCalcFilter = pPreselectedFilter->GetServiceName().EqualsAscii("com.sun.star.sheet.SpreadsheetDocument"); + bIsCalcFilter = pPreselectedFilter->GetServiceName() == "com.sun.star.sheet.SpreadsheetDocument"; } if ( aOldName.EqualsAscii(pFilterEx97Temp) || !bIsCalcFilter ) @@ -498,7 +498,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) else { // else use Excel 97 filter - pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterExcel97) ); + pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterExcel97) ); } } else if ( bExcel5Stream ) @@ -511,7 +511,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // we can simulate it by preserving the preselected filter if the type matches // example: Excel filters for Writer aOldName = pPreselectedFilter->GetFilterName(); - bIsCalcFilter = pPreselectedFilter->GetServiceName().EqualsAscii("com.sun.star.sheet.SpreadsheetDocument"); + bIsCalcFilter = pPreselectedFilter->GetServiceName() == "com.sun.star.sheet.SpreadsheetDocument"; } if ( aOldName.EqualsAscii(pFilterExcel95) || aOldName.EqualsAscii(pFilterEx95Temp) || @@ -522,12 +522,12 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) else if ( aOldName.EqualsAscii(pFilterEx97Temp) ) { // auto detection has found template -> return Excel5 template - pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterEx5Temp) ); + pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterEx5Temp) ); } else { // sonst wird als Excel 5-Datei erkannt - pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterExcel5) ); + pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterExcel5) ); } } } @@ -721,7 +721,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) } else { // gefundenen Filter einstellen - pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterName[ nFilter ]) ); + pFilter = aMatcher.GetFilter4FilterName( rtl::OUString::createFromAscii(pFilterName[ nFilter ]) ); } bSync = false; // leave inner loop nFilter = nFilterCount; // leave outer loop @@ -754,7 +754,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) if ( aHeader.copy(0, 5).equalsL("{\\rtf", 5) ) { // test for RTF - pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterRtf) ); + pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterRtf) ); } else if ( bIsXLS && (bMaybeText && !bMaybeHtml) ) { @@ -763,7 +763,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // The configured detection for Excel 2003 XML is still in XMLFilterDetect. pFilter = lcl_DetectExcelXML( rStr, aMatcher ); if (!pFilter) - pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterAscii) ); + pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterAscii) ); bFakeXLS = true; } else if ( pPreselectedFilter->GetName().EqualsAscii(pFilterDBase) && lcl_MayBeDBase( rStr ) ) @@ -787,7 +787,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) } else { - pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterHtmlWeb) ); + pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterHtmlWeb) ); if ( bIsXLS ) bFakeXLS = true; } diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 7884f551e9da..23e6ed4914e4 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -430,19 +430,19 @@ const ScDisplayNameMap* lcl_GetStyleNameMap( sal_uInt16 nType ) if ( !bCellMapFilled ) { aCellMap[0].aDispName = ScGlobal::GetRscString( STR_STYLENAME_STANDARD ); - aCellMap[0].aProgName = String::CreateFromAscii( SC_STYLE_PROG_STANDARD ); + aCellMap[0].aProgName = rtl::OUString( SC_STYLE_PROG_STANDARD ); aCellMap[1].aDispName = ScGlobal::GetRscString( STR_STYLENAME_RESULT ); - aCellMap[1].aProgName = String::CreateFromAscii( SC_STYLE_PROG_RESULT ); + aCellMap[1].aProgName = rtl::OUString( SC_STYLE_PROG_RESULT ); aCellMap[2].aDispName = ScGlobal::GetRscString( STR_STYLENAME_RESULT1 ); - aCellMap[2].aProgName = String::CreateFromAscii( SC_STYLE_PROG_RESULT1 ); + aCellMap[2].aProgName = rtl::OUString( SC_STYLE_PROG_RESULT1 ); aCellMap[3].aDispName = ScGlobal::GetRscString( STR_STYLENAME_HEADLINE ); - aCellMap[3].aProgName = String::CreateFromAscii( SC_STYLE_PROG_HEADLINE ); + aCellMap[3].aProgName = rtl::OUString( SC_STYLE_PROG_HEADLINE ); aCellMap[4].aDispName = ScGlobal::GetRscString( STR_STYLENAME_HEADLINE1 ); - aCellMap[4].aProgName = String::CreateFromAscii( SC_STYLE_PROG_HEADLINE1 ); + aCellMap[4].aProgName = rtl::OUString( SC_STYLE_PROG_HEADLINE1 ); // last entry remains empty @@ -457,10 +457,10 @@ const ScDisplayNameMap* lcl_GetStyleNameMap( sal_uInt16 nType ) if ( !bPageMapFilled ) { aPageMap[0].aDispName = ScGlobal::GetRscString( STR_STYLENAME_STANDARD ); - aPageMap[0].aProgName = String::CreateFromAscii( SC_STYLE_PROG_STANDARD ); + aPageMap[0].aProgName = rtl::OUString( SC_STYLE_PROG_STANDARD ); aPageMap[1].aDispName = ScGlobal::GetRscString( STR_STYLENAME_REPORT ); - aPageMap[1].aProgName = String::CreateFromAscii( SC_STYLE_PROG_REPORT ); + aPageMap[1].aProgName = rtl::OUString( SC_STYLE_PROG_REPORT ); // last entry remains empty diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index 3d80796718f1..90848f49a858 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -408,7 +408,7 @@ void CompileODFFormulaToExcel( ScDocument* pDoc, const String& rOldFormula, Stri if ( pToken->GetOpCode() == ocSep ) { // Excel formula separator is ",". - rFormula = String::CreateFromAscii(","); + rFormula = rtl::OUString(","); } rNewFormula += rFormula; } diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx index ea06ef21e054..b6cd0a57e126 100644 --- a/sc/source/ui/vba/vbanames.cxx +++ b/sc/source/ui/vba/vbanames.cxx @@ -184,9 +184,9 @@ ScVbaNames::Add( const css::uno::Any& Name , ScAddress aPos( static_cast< SCCOL >( aAddr.StartColumn ) , static_cast< SCROW >( aAddr.StartRow ) , static_cast< SCTAB >(aAddr.Sheet ) ); uno::Any xAny2 ; String sRangeAdd = xRange->Address( xAny2, xAny2 , xAny2 , xAny2, xAny2 ); - aContent += String::CreateFromAscii("$"); + aContent += rtl::OUString("$"); aContent += UniString(xRange->getWorksheet()->getName()); - aContent += String::CreateFromAscii("."); + aContent += rtl::OUString("."); aContent += sRangeAdd; aPosition = table::CellAddress( aAddr.Sheet , aAddr.StartColumn , aAddr.StartRow ); } diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 7a887d5cf18f..ee9d3ab96a50 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -626,7 +626,7 @@ sal_Bool ScViewFunc::PasteFile( const Point& rPos, const String& rFile, sal_Bool SfxStringItem aFileNameItem( SID_FILE_NAME, aStrURL ); SfxStringItem aFilterItem( SID_FILTER_NAME, pFlt->GetName() ); // #i69524# add target, as in SfxApplication when the Open dialog is used - SfxStringItem aTargetItem( SID_TARGETNAME, String::CreateFromAscii("_default") ); + SfxStringItem aTargetItem( SID_TARGETNAME, rtl::OUString("_default") ); // Asynchron oeffnen, kann naemlich auch aus D&D heraus passieren // und das bekommt dem MAC nicht so gut ... -- cgit v1.2.3