diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-02-10 01:58:15 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-02-10 01:59:26 +0900 |
commit | e7e0455b0285f60ba999a0a6a831f3be271f5a37 (patch) | |
tree | 612248965d3b28720ae47d93c2ddf2dcd017e30e | |
parent | ef09cbf45347f5f1ea34f35acedeea5aa3a7f6f6 (diff) |
Prefer equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("...")) to equalsAscii("...")
-rw-r--r-- | cui/source/factory/dlgfact.cxx | 8 | ||||
-rw-r--r-- | filter/source/odfflatxml/OdfFlatXml.cxx | 8 | ||||
-rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 18 | ||||
-rw-r--r-- | framework/source/lomenubar/FrameJob.cxx | 4 | ||||
-rw-r--r-- | oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 2 | ||||
-rw-r--r-- | sax/source/tools/converter.cxx | 12 | ||||
-rw-r--r-- | sc/qa/unit/ucalc.cxx | 34 | ||||
-rw-r--r-- | sc/source/core/tool/interpr1.cxx | 20 | ||||
-rw-r--r-- | sc/source/filter/excel/xehelper.cxx | 6 | ||||
-rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun5.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/SfxDocumentMetaData.cxx | 2 | ||||
-rw-r--r-- | starmath/source/mathmlexport.cxx | 2 | ||||
-rw-r--r-- | test/source/sheet/xdatapilotdescriptor.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLAxisContext.cxx | 6 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 2 |
18 files changed, 67 insertions, 67 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 04fa895aa1da..582542172dbd 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1881,11 +1881,11 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia const SvObjectServerList* pList ) { InsertObjectDialog_Impl* pDlg=0; - if ( rCommand.equalsAscii(".uno:InsertObject" ) ) + if ( rCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:InsertObject")) ) pDlg = new SvInsertOleDlg( pParent, xStor, pList ); - else if ( rCommand.equalsAscii(".uno:InsertPlugin" ) ) + else if ( rCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:InsertPlugin")) ) pDlg = new SvInsertPlugInDialog( pParent, xStor ); - else if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) ) + else if ( rCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:InsertObjectFloatingFrame")) ) pDlg = new SfxInsertFloatingFrameDialog( pParent, xStor ); if ( pDlg ) @@ -1900,7 +1900,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* p const Reference < com::sun::star::embed::XEmbeddedObject >& xObj ) { InsertObjectDialog_Impl* pDlg=0; - if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) ) + if ( rCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:InsertObjectFloatingFrame")) ) { pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj ); pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) ); diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index 87714e9f7552..64714042f7c9 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -131,9 +131,9 @@ OdfFlatXml::importer( for (sal_Int32 paramIdx = 0; paramIdx < paramCount; paramIdx++) { paramName = sourceData[paramIdx].Name; - if (paramName.equalsAscii("InputStream")) + if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream"))) sourceData[paramIdx].Value >>= inputStream; - else if (paramName.equalsAscii("URL")) + else if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL"))) sourceData[paramIdx].Value >>= url; } @@ -183,9 +183,9 @@ OdfFlatXml::exporter(const Sequence< PropertyValue >& sourceData, for (sal_Int32 paramIdx = 0; paramIdx < paramCount; paramIdx++) { paramName = sourceData[paramIdx].Name; - if (paramName.equalsAscii("OutputStream")) + if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OutputStream"))) sourceData[paramIdx].Value >>= outputStream; - else if (paramName.equalsAscii("URL")) + else if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL"))) sourceData[paramIdx].Value >>= targetURL; } diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index c61fe17f306c..06d4f47f6c08 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -282,13 +282,13 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) { aName = aSourceData[i].Name; Any value = aSourceData[i].Value; - if (aName.equalsAscii("InputStream")) + if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream"))) value >>= xInputStream; - else if (aName.equalsAscii("FileName")) + else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName"))) value >>= aFileName; - else if (aName.equalsAscii("URL")) + else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL"))) value >>= aURL; - else if (aName.equalsAscii("InteractionHandler")) + else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler"))) value >>= xInterActionHandler; } OSL_ASSERT(xInputStream.is()); @@ -441,15 +441,15 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) for (sal_Int32 i = 0; i < nLength; i++) { aName = aSourceData[i].Name; - if (aName.equalsAscii("Indent")) + if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Indent"))) aSourceData[i].Value >>= bIndent; - if (aName.equalsAscii("DocType_Public")) + if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocType_Public"))) aSourceData[i].Value >>= aDoctypePublic; - if (aName.equalsAscii("DocType_System")) + if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocType_System"))) aSourceData[i].Value >>= aDoctypeSystem; - if (aName.equalsAscii("OutputStream")) + if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OutputStream"))) aSourceData[i].Value >>= m_rOutputStream; - else if (aName.equalsAscii("URL")) + else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL"))) aSourceData[i].Value >>= sURL; } diff --git a/framework/source/lomenubar/FrameJob.cxx b/framework/source/lomenubar/FrameJob.cxx index fd9d5dae9fa5..cb3643c617a8 100644 --- a/framework/source/lomenubar/FrameJob.cxx +++ b/framework/source/lomenubar/FrameJob.cxx @@ -225,7 +225,7 @@ Any SAL_CALL FrameJob::execute( const Sequence< NamedValue >& aArguments ) for (int i = 0; i<len; i++) { - if (aArguments[i].Name.equalsAscii("Environment")) + if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Environment"))) { aArguments[i].Value >>= lEnv; break; @@ -235,7 +235,7 @@ Any SAL_CALL FrameJob::execute( const Sequence< NamedValue >& aArguments ) len = lEnv.getLength (); for (int i = 0; i<len; i++) { - if (lEnv[i].Name.equalsAscii("Model")) + if (lEnv[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Model"))) { lEnv[i].Value >>= xModel; } diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 5bad9f544769..493dcf2c85d7 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -131,7 +131,7 @@ const std::vector<LayoutAtomPtr>& ConditionAtom::getChildren() const bool bDecisionVar=true; // HACK if( maCond.mnFunc==XML_var && maCond.mnArg==XML_dir && - maCond.mnOp==XML_equ && !maCond.msVal.equalsAscii("norm") ) + maCond.mnOp==XML_equ && !maCond.msVal.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("norm")) ) bDecisionVar=false; if( bDecisionVar ) diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index 8d573e2e3f64..f71ea6253a88 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -2217,7 +2217,7 @@ bool Converter::convertAny(com::sun::star::uno::Any& rValue, { bool bConverted = false; - if (rsType.equalsAscii("boolean")) + if (rsType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("boolean"))) { bool bTempValue = false; ::sax::Converter::convertBool(bTempValue, rsValue); @@ -2225,7 +2225,7 @@ bool Converter::convertAny(com::sun::star::uno::Any& rValue, bConverted = true; } else - if (rsType.equalsAscii("integer")) + if (rsType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("integer"))) { sal_Int32 nTempValue = 0; ::sax::Converter::convertNumber(nTempValue, rsValue); @@ -2233,7 +2233,7 @@ bool Converter::convertAny(com::sun::star::uno::Any& rValue, bConverted = true; } else - if (rsType.equalsAscii("float")) + if (rsType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("float"))) { double fTempValue = 0.0; ::sax::Converter::convertDouble(fTempValue, rsValue); @@ -2241,13 +2241,13 @@ bool Converter::convertAny(com::sun::star::uno::Any& rValue, bConverted = true; } else - if (rsType.equalsAscii("string")) + if (rsType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("string"))) { rValue <<= rsValue; bConverted = true; } else - if (rsType.equalsAscii("date")) + if (rsType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("date"))) { com::sun::star::util::DateTime aTempValue; ::sax::Converter::convertDateTime(aTempValue, rsValue); @@ -2255,7 +2255,7 @@ bool Converter::convertAny(com::sun::star::uno::Any& rValue, bConverted = true; } else - if (rsType.equalsAscii("time")) + if (rsType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("time"))) { com::sun::star::util::Duration aTempValue; com::sun::star::util::Time aConvValue; diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index a7bfe2cef5b4..37a8ee71193a 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -295,11 +295,11 @@ void Test::testInput() m_pDoc->SetString(0, 0, 0, numstr); m_pDoc->GetString(0, 0, 0, test); - bool bTest = test.equalsAscii("10.5"); + bool bTest = test.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("10.5")); CPPUNIT_ASSERT_MESSAGE("String number should have the first apostrophe stripped.", bTest); m_pDoc->SetString(0, 0, 0, str); m_pDoc->GetString(0, 0, 0, test); - bTest = test.equalsAscii("'apple'"); + bTest = test.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("'apple'")); CPPUNIT_ASSERT_MESSAGE("Text content should have retained the first apostrophe.", bTest); m_pDoc->DeleteTab(0); @@ -1832,7 +1832,7 @@ void Test::testPivotTableNamedSource() m_pDoc->MoveTab(1, 0); rtl::OUString aTabName; m_pDoc->GetName(0, aTabName); - CPPUNIT_ASSERT_MESSAGE("Wrong sheet name.", aTabName.equalsAscii("Table")); + CPPUNIT_ASSERT_MESSAGE("Wrong sheet name.", aTabName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Table"))); CPPUNIT_ASSERT_MESSAGE("Pivot table output is on the wrong sheet!", pDPObj->GetOutRange().aStart.Tab() == 0); @@ -1915,7 +1915,7 @@ void Test::testSheetMove() CPPUNIT_ASSERT_MESSAGE("copied sheet should also have all rows visible as the original.", !bHidden && nRow1 == 0 && nRow2 == MAXROW); rtl::OUString aName; m_pDoc->GetName(0, aName); - CPPUNIT_ASSERT_MESSAGE("sheets should have changed places", aName.equalsAscii("TestTab1")); + CPPUNIT_ASSERT_MESSAGE("sheets should have changed places", aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TestTab1"))); m_pDoc->SetRowHidden(5, 10, 0, true); bHidden = m_pDoc->RowHidden(0, 0, &nRow1, &nRow2); @@ -1935,7 +1935,7 @@ void Test::testSheetMove() bHidden = m_pDoc->RowHidden(11, 1, &nRow1, &nRow2); CPPUNIT_ASSERT_MESSAGE("rows 11 - maxrow should be visible", !bHidden && nRow1 == 11 && nRow2 == MAXROW); m_pDoc->GetName(0, aName); - CPPUNIT_ASSERT_MESSAGE("sheets should have changed places", aName.equalsAscii("TestTab2")); + CPPUNIT_ASSERT_MESSAGE("sheets should have changed places", aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TestTab2"))); m_pDoc->DeleteTab(1); m_pDoc->DeleteTab(0); } @@ -2185,9 +2185,9 @@ void testExtRefFuncT(ScDocument* pDoc, ScDocument* pExtDoc) pDoc->CalcAll(); rtl::OUString aRes = pDoc->GetString(0, 0, 0); - CPPUNIT_ASSERT_MESSAGE("Unexpected result with T.", aRes.equalsAscii("1.2")); + CPPUNIT_ASSERT_MESSAGE("Unexpected result with T.", aRes.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1.2"))); aRes = pDoc->GetString(0, 1, 0); - CPPUNIT_ASSERT_MESSAGE("Unexpected result with T.", aRes.equalsAscii("Foo")); + CPPUNIT_ASSERT_MESSAGE("Unexpected result with T.", aRes.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Foo"))); aRes = pDoc->GetString(0, 2, 0); CPPUNIT_ASSERT_MESSAGE("Unexpected result with T.", aRes.isEmpty()); } @@ -2959,22 +2959,22 @@ void Test::testToggleRefFlag() // column relative / row relative -> column absolute / row absolute aFinder.ToggleRel(0, aFormula.getLength()); aFormula = aFinder.GetText(); - CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAscii("=$B$100")); + CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("=$B$100"))); // column absolute / row absolute -> column relative / row absolute aFinder.ToggleRel(0, aFormula.getLength()); aFormula = aFinder.GetText(); - CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAscii("=B$100")); + CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("=B$100"))); // column relative / row absolute -> column absolute / row relative aFinder.ToggleRel(0, aFormula.getLength()); aFormula = aFinder.GetText(); - CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAscii("=$B100")); + CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("=$B100"))); // column absolute / row relative -> column relative / row relative aFinder.ToggleRel(0, aFormula.getLength()); aFormula = aFinder.GetText(); - CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAscii("=B100")); + CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("=B100"))); } { @@ -2990,22 +2990,22 @@ void Test::testToggleRefFlag() // column absolute / row absolute -> column relative / row absolute aFinder.ToggleRel(0, aFormula.getLength()); aFormula = aFinder.GetText(); - CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAscii("=R2C[-3]")); + CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("=R2C[-3]"))); // column relative / row absolute - > column absolute / row relative aFinder.ToggleRel(0, aFormula.getLength()); aFormula = aFinder.GetText(); - CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAscii("=R[-4]C1")); + CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("=R[-4]C1"))); // column absolute / row relative -> column relative / row relative aFinder.ToggleRel(0, aFormula.getLength()); aFormula = aFinder.GetText(); - CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAscii("=R[-4]C[-3]")); + CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("=R[-4]C[-3]"))); // column relative / row relative -> column absolute / row absolute aFinder.ToggleRel(0, aFormula.getLength()); aFormula = aFinder.GetText(); - CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAscii("=R2C1")); + CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("=R2C1"))); } // TODO: Add more test cases esp. for 3D references, Excel A1 syntax, and @@ -3186,13 +3186,13 @@ void Test::testCopyPaste() m_pDoc->GetValue(1,1,1, aValue); CPPUNIT_ASSERT_MESSAGE("after undo formula should return nothing", aValue == 0); m_pDoc->GetString(2,1,1, aString); - CPPUNIT_ASSERT_MESSAGE("after undo string should be removed", aString.equalsAscii("")); + CPPUNIT_ASSERT_MESSAGE("after undo string should be removed", aString.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(""))); pUndo->Redo(); m_pDoc->GetValue(1,1,1, aValue); CPPUNIT_ASSERT_MESSAGE("formula should return 2 after redo", aValue == 2); m_pDoc->GetString(2,1,1, aString); - CPPUNIT_ASSERT_MESSAGE("Cell Sheet2.C2 should contain: test", aString.equalsAscii("test")); + CPPUNIT_ASSERT_MESSAGE("Cell Sheet2.C2 should contain: test", aString.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test"))); m_pDoc->GetFormula(1,1,1, aString); CPPUNIT_ASSERT_MESSAGE("Formula should be correct again", aString == aFormulaString); diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index ac4886cb6e3e..e1eb8bddff0e 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -2330,11 +2330,11 @@ void ScInterpreter::ScCellExternal() ScCellKeywordTranslator::transKeyword(aInfoType, ScGlobal::GetLocale(), ocCell); ScExternalRefManager* pRefMgr = pDok->GetExternalRefManager(); - if (aInfoType.equalsAscii("COL")) + if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("COL"))) PushInt(nCol + 1); - else if (aInfoType.equalsAscii("ROW")) + else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ROW"))) PushInt(nRow + 1); - else if (aInfoType.equalsAscii("SHEET")) + else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SHEET"))) { // For SHEET, No idea what number we should set, but let's always set // 1 if the external sheet exists, no matter what sheet. Excel does @@ -2344,7 +2344,7 @@ void ScInterpreter::ScCellExternal() else SetError(errNoName); } - else if (aInfoType.equalsAscii("ADDRESS")) + else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ADDRESS"))) { // ODF 1.2 says we need to always display address using the ODF A1 grammar. ScTokenArray aArray; @@ -2355,7 +2355,7 @@ void ScInterpreter::ScCellExternal() aComp.CreateStringFromTokenArray(aStr); PushString(aStr); } - else if (aInfoType.equalsAscii("FILENAME")) + else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FILENAME"))) { // 'file URI'#$SheetName @@ -2374,7 +2374,7 @@ void ScInterpreter::ScCellExternal() aBuf.append(aTabName); PushString(aBuf.makeStringAndClear()); } - else if (aInfoType.equalsAscii("CONTENTS")) + else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CONTENTS"))) { switch (pToken->GetType()) { @@ -2391,7 +2391,7 @@ void ScInterpreter::ScCellExternal() PushString(ScGlobal::GetEmptyString()); } } - else if (aInfoType.equalsAscii("TYPE")) + else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TYPE"))) { sal_Unicode c = 'v'; switch (pToken->GetType()) @@ -2407,14 +2407,14 @@ void ScInterpreter::ScCellExternal() } PushString(rtl::OUString(c)); } - else if (aInfoType.equalsAscii("FORMAT")) + else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FORMAT"))) { String aFmtStr; sal_uLong nFmt = aFmt.mbIsSet ? aFmt.mnIndex : 0; getFormatString(pFormatter, nFmt, aFmtStr); PushString(aFmtStr); } - else if (aInfoType.equalsAscii("COLOR")) + else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("COLOR"))) { // 1 = negative values are colored, otherwise 0 int nVal = 0; @@ -2425,7 +2425,7 @@ void ScInterpreter::ScCellExternal() } PushInt(nVal); } - else if(aInfoType.equalsAscii("PARENTHESES")) + else if(aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PARENTHESES"))) { // 1 = format string contains a '(' character, otherwise 0 int nVal = 0; diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index c9146b7550dd..3e805feb4919 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -912,13 +912,13 @@ rtl::OUString lclEncodeDosUrl( rtl::OUString aOldUrl = rUrl; aBuf.append(EXC_URLSTART_ENCODED); - if (aOldUrl.getLength() > 2 && aOldUrl.copy(0,2).equalsAscii("\\\\")) + if (aOldUrl.getLength() > 2 && aOldUrl.copy(0,2).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("\\\\"))) { // UNC aBuf.append(EXC_URL_DOSDRIVE).append(sal_Unicode('@')); aOldUrl = aOldUrl.copy(2); } - else if (aOldUrl.getLength() > 2 && aOldUrl.copy(1,2).equalsAscii(":\\")) + else if (aOldUrl.getLength() > 2 && aOldUrl.copy(1,2).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(":\\"))) { // drive letter sal_Unicode cThisDrive = rBase.isEmpty() ? ' ' : rBase.getStr()[0]; @@ -935,7 +935,7 @@ rtl::OUString lclEncodeDosUrl( sal_Int32 nPos = -1; while((nPos = aOldUrl.indexOf('\\')) != -1) { - if (aOldUrl.copy(0,2).equalsAscii("..")) + if (aOldUrl.copy(0,2).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".."))) // parent dir (NOTE: the MS-XLS spec doesn't mention this, and // Excel seems confused by this token). aBuf.append(EXC_URL_PARENTDIR); diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index d953fc1bcbba..ee1a37eef178 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -2833,7 +2833,7 @@ void XclImpPictureObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal if( (rStrm.GetNextRecId() == EXC_ID3_IMGDATA) && rStrm.StartNextRecord() ) { // page background is stored as hidden picture with name "__BkgndObj" - if (IsHidden() && (GetObjName().equalsAscii("__BkgndObj"))) + if (IsHidden() && (GetObjName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("__BkgndObj")))) GetPageSettings().ReadImgData( rStrm ); else maGraphic = XclImpDrawing::ReadImgData( GetRoot(), rStrm ); diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index fa102dd7d00c..5169b0144f14 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1405,7 +1405,7 @@ void ScInputHandler::PasteManualTip() // (wenn wir mal Matrix-Konstanten haben, kann das geaendert werden) sal_Int32 nTipLen = aManualTip.getLength(); - if ( nTipLen && ( nTipLen < 3 || !aManualTip.copy( nTipLen-3 ).equalsAscii("...") ) ) + if ( nTipLen && ( nTipLen < 3 || !aManualTip.copy( nTipLen-3 ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("...")) ) ) { DataChanging(); // kann nicht neu sein diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 4c852db3d0ad..1fbc0678533d 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -1291,7 +1291,7 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, SCROW nRow, bool bDataSelec nSelPos = pFilterBox->GetEntryPos(rQueryStr); } } - else if (rEntry.eOp == SC_TOPVAL && rQueryStr.equalsAscii("10")) + else if (rEntry.eOp == SC_TOPVAL && rQueryStr.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("10"))) nSelPos = SC_AUTOFILTER_TOP10; else nSelPos = SC_AUTOFILTER_CUSTOM; diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 08dc06228a2e..fa305a570ab7 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -698,7 +698,7 @@ bool ScViewFunc::PasteLink( const uno::Reference<datatransfer::XTransferable>& r if (aStrs.size() > 3) pExtra = &aStrs[3]; - if (pExtra && pExtra->equalsAscii("calc:extref")) + if (pExtra && pExtra->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("calc:extref"))) { // Paste this as an external reference. Note that paste link always // uses Calc A1 syntax even when another formula syntax is specified diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 8b4416c35e0f..a97b7cee93f0 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -1210,7 +1210,7 @@ void SAL_CALL SfxDocumentMetaData::init( if (css::xml::dom::NodeType_ELEMENT_NODE ==xNode->getNodeType()) { if (xNode->getNamespaceURI().equalsAscii(s_nsODF) && - xNode->getLocalName().equalsAscii("document-meta")) + xNode->getLocalName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("document-meta"))) { xRElem.set(xNode, css::uno::UNO_QUERY_THROW); break; diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index d35e161300e3..951d075550f1 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -743,7 +743,7 @@ void SmXMLExport::GetConfigurationSettings( Sequence < PropertyValue > & rProps) rtl::OUString aActualName( rPropName ); // handle 'save used symbols only' - if (bUsedSymbolsOnly && rPropName.equalsAscii("Symbols")) + if (bUsedSymbolsOnly && rPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Symbols"))) aActualName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "UserDefinedSymbolsInUse" ) ); pProps->Value = xProps->getPropertyValue( aActualName ); diff --git a/test/source/sheet/xdatapilotdescriptor.cxx b/test/source/sheet/xdatapilotdescriptor.cxx index eaddff59a44d..49704a41ad8f 100644 --- a/test/source/sheet/xdatapilotdescriptor.cxx +++ b/test/source/sheet/xdatapilotdescriptor.cxx @@ -106,7 +106,7 @@ void XDataPilotDescriptor::testGetDataPilotFields_Impl( uno::Reference< sheet::X CPPUNIT_ASSERT(xNamed.is()); rtl::OUString aName = xNamed->getName(); maFieldNames.push_back(aName); - CPPUNIT_ASSERT( !aName.equalsAscii("Data") ); + CPPUNIT_ASSERT( !aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Data")) ); uno::Reference< beans::XPropertySet > xPropSet( xNamed, UNO_QUERY_THROW); CPPUNIT_ASSERT( xPropSet.is() ); diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx index 35807f828c69..4067e2c4de57 100644 --- a/xmloff/source/chart/SchXMLAxisContext.cxx +++ b/xmloff/source/chart/SchXMLAxisContext.cxx @@ -766,9 +766,9 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc const OUString& rODFVersionOfFile, bool bAxisPositionAttributeImported ) { - if( ( rODFVersionOfFile.isEmpty() || rODFVersionOfFile.equalsAscii("1.0") - || rODFVersionOfFile.equalsAscii("1.1") - || ( rODFVersionOfFile.equalsAscii("1.2") && !bAxisPositionAttributeImported ) ) ) + if( ( rODFVersionOfFile.isEmpty() || rODFVersionOfFile.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1.0")) + || rODFVersionOfFile.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1.1")) + || ( rODFVersionOfFile.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1.2")) && !bAxisPositionAttributeImported ) ) ) { try { diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx index 652c095ad1a4..f008f670cb7c 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx @@ -389,7 +389,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su ::rtl::OUString objId = ::rtl::OUString::createFromAscii( pExtn->pszObjId ); - if ( objId.equalsAscii("2.5.29.17") ) + if ( objId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2.5.29.17")) ) xExtn = (CertificateExtension_XmlSecImpl*) new SanExtensionImpl() ; else xExtn = new CertificateExtension_XmlSecImpl() ; |