From fe99ee368fef4059e187a81059679ca150161119 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 15 Dec 2014 10:18:44 +0100 Subject: sw: Use appropriate OUString functions on string constants Change-Id: I559d1e44d9096a2583af8e05468b3743ac210c6c --- sw/qa/extras/inc/swmodeltestbase.hxx | 6 +++--- sw/qa/extras/mailmerge/mailmerge.cxx | 2 +- sw/source/core/access/accdoc.cxx | 6 +++--- sw/source/core/access/acchyperlink.cxx | 2 +- sw/source/core/crsr/annotationmark.cxx | 2 +- sw/source/core/crsr/findtxt.cxx | 6 +++--- sw/source/core/text/EnhancedPDFExportHelper.cxx | 14 +++++++------- sw/source/core/unocore/unoidx.cxx | 6 +++--- sw/source/core/unocore/unostyle.cxx | 12 ++++++------ sw/source/filter/basflt/iodetect.cxx | 2 +- sw/source/filter/html/SwAppletImpl.cxx | 5 ++--- sw/source/filter/html/htmlcss1.cxx | 6 +++--- sw/source/filter/html/htmlforw.cxx | 4 ++-- sw/source/ui/envelp/mailmrge.cxx | 2 +- sw/source/ui/vba/vbaaddins.cxx | 2 +- sw/source/uibase/app/docst.cxx | 10 +++++----- sw/source/uibase/config/modcfg.cxx | 2 +- sw/source/uibase/dbui/dbmgr.cxx | 2 +- sw/source/uibase/dbui/mailmergehelper.cxx | 6 +++--- sw/source/uibase/uno/unotxdoc.cxx | 20 ++++++++++---------- 20 files changed, 58 insertions(+), 59 deletions(-) (limited to 'sw') diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index dedd5a9c3c6b..8e8dea8a2e12 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -67,7 +67,7 @@ using namespace css; #define DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, BaseClass) \ class TestName : public BaseClass { \ protected:\ - virtual OUString getTestName() SAL_OVERRIDE { return OUString::createFromAscii(#TestName); } \ + virtual OUString getTestName() SAL_OVERRIDE { return OUString(#TestName); } \ public:\ CPPUNIT_TEST_SUITE(TestName); \ CPPUNIT_TEST(Import); \ @@ -116,7 +116,7 @@ using namespace css; #define DECLARE_SW_IMPORT_TEST(TestName, filename, BaseClass) \ class TestName : public BaseClass { \ protected:\ - virtual OUString getTestName() SAL_OVERRIDE { return OUString::createFromAscii(#TestName); } \ + virtual OUString getTestName() SAL_OVERRIDE { return OUString(#TestName); } \ public:\ CPPUNIT_TEST_SUITE(TestName); \ CPPUNIT_TEST(Import); \ @@ -133,7 +133,7 @@ using namespace css; #define DECLARE_SW_EXPORT_TEST(TestName, filename, BaseClass) \ class TestName : public BaseClass { \ protected:\ - virtual OUString getTestName() SAL_OVERRIDE { return OUString::createFromAscii(#TestName); } \ + virtual OUString getTestName() SAL_OVERRIDE { return OUString(#TestName); } \ public:\ CPPUNIT_TEST_SUITE(TestName); \ CPPUNIT_TEST(Import_Export); \ diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx index 94d084bac7b3..ca48e68699e1 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -211,7 +211,7 @@ protected: #define DECLARE_MAILMERGE_TEST(TestName, filename, datasource, tablename, file, BaseClass) \ class TestName : public BaseClass { \ protected: \ - virtual OUString getTestName() SAL_OVERRIDE { return OUString::createFromAscii(#TestName); } \ + virtual OUString getTestName() SAL_OVERRIDE { return OUString(#TestName); } \ public: \ CPPUNIT_TEST_SUITE(TestName); \ CPPUNIT_TEST(MailMerge); \ diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index aed395800fa1..2d82015f4916 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -569,18 +569,18 @@ void SAL_CALL SwAccessibleDocument::notifyEvent( const ::com::sun::star::documen { SolarMutexGuard g; - if ( Event.EventName.equalsAscii( "FirstPageShows" ) ) + if ( Event.EventName == "FirstPageShows" ) { FireStateChangedEvent( AccessibleStateType::FOCUSED,true ); } - else if ( Event.EventName.equalsAscii( "LoadFinished" ) ) + else if ( Event.EventName == "LoadFinished" ) { // IA2 CWS. MT: OFFSCREEN == !SHOWING, should stay consistent // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,true ); // MT: LoadFinished => Why not SHOWING == TRUE? FireStateChangedEvent( AccessibleStateType::SHOWING,false ); } - else if ( Event.EventName.equalsAscii( "FormatFinished" ) ) + else if ( Event.EventName == "FormatFinished" ) { FireStateChangedEvent( AccessibleStateType::BUSY,false ); // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,false ); diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx index ab0452b8b9c1..09d2d69a70b2 100644 --- a/sw/source/core/access/acchyperlink.cxx +++ b/sw/source/core/access/acchyperlink.cxx @@ -212,7 +212,7 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::isValid( ) uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); if( ! xFactory.is() ) return sal_False; - uno::Reference< com::sun::star::frame::XDesktop > xDesktop( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), + uno::Reference< com::sun::star::frame::XDesktop > xDesktop( xFactory->createInstance( "com.sun.star.frame.Desktop" ), uno::UNO_QUERY ); if( !xDesktop.is() ) return sal_False; diff --git a/sw/source/core/crsr/annotationmark.cxx b/sw/source/core/crsr/annotationmark.cxx index b4e3c1fe2483..cccc3c420251 100644 --- a/sw/source/core/crsr/annotationmark.cxx +++ b/sw/source/core/crsr/annotationmark.cxx @@ -41,7 +41,7 @@ namespace sw { namespace mark { if ( rName.getLength() == 0 ) { - SetName( MarkBase::GenerateNewName( ::rtl::OUString::createFromAscii("__Annotation__") ) ); + SetName( MarkBase::GenerateNewName("__Annotation__") ); } } diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index 15de11b3467d..8b1d6d171c24 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -231,9 +231,9 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te const bool bRegSearch = SearchAlgorithms_REGEXP == rSearchOpt.algorithmType; const bool bChkEmptyPara = bRegSearch && 2 == rSearchOpt.searchString.getLength() && - ( rSearchOpt.searchString.equalsAscii( "^$" ) || - rSearchOpt.searchString.equalsAscii( "$^" ) ); - const bool bChkParaEnd = bRegSearch && rSearchOpt.searchString.equalsAscii( "$" ); + ( rSearchOpt.searchString == "^$" || + rSearchOpt.searchString == "$^" ); + const bool bChkParaEnd = bRegSearch && rSearchOpt.searchString == "$"; // LanguageType eLastLang = 0; while( 0 != ( pNode = ::GetNode( *pPam, bFirst, fnMove, bInReadOnly ) )) diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index d5935f4fde22..6b3b79be69c1 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -174,7 +174,7 @@ bool lcl_IsHeadlineCell( const SwCellFrm& rCellFrm ) OUString sStyleName; SwStyleNameMapper::FillProgName( pTxtFmt->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); - bRet = sStyleName.equalsAscii(aTableHeadingName); + bRet = sStyleName == aTableHeadingName; } return bRet; @@ -1081,7 +1081,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() // Quotations: BlockQuote - if (sStyleName.equalsAscii(aQuotations)) + if (sStyleName == aQuotations) { nPDFType = vcl::PDFWriter::BlockQuote; aPDFType = OUString(aBlockQuoteString); @@ -1089,7 +1089,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() // Caption: Caption - else if (sStyleName.equalsAscii(aCaption)) + else if (sStyleName == aCaption) { nPDFType = vcl::PDFWriter::Caption; aPDFType = OUString(aCaptionString); @@ -1097,7 +1097,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() // Caption: Caption - else if (sParentStyleName.equalsAscii(aCaption)) + else if (sParentStyleName == aCaption) { nPDFType = vcl::PDFWriter::Caption; aPDFType = sStyleName + aCaptionString; @@ -1105,7 +1105,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() // Heading: H - else if (sStyleName.equalsAscii(aHeading)) + else if (sStyleName == aHeading) { nPDFType = vcl::PDFWriter::Heading; aPDFType = OUString(aHString); @@ -1362,12 +1362,12 @@ void SwTaggedPDFHelper::BeginInlineStructureElements() aPDFType = OUString(aLinkString); } // Check for Quote/Code character style: - else if (sStyleName.equalsAscii(aQuotation)) + else if (sStyleName == aQuotation) { nPDFType = vcl::PDFWriter::Quote; aPDFType = OUString(aQuoteString); } - else if (sStyleName.equalsAscii(aSourceText)) + else if (sStyleName == aSourceText) { nPDFType = vcl::PDFWriter::Code; aPDFType = OUString(aCodeString); diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 9fddc2ad436c..387e8883f041 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -152,7 +152,7 @@ static void lcl_ConvertTOUNameToProgrammaticName(OUString& rTmp) } // if the version is not English but the alternative index's name is // "User-Defined" a " (user)" is appended - else if(rTmp.equalsAscii(cUserDefined)) + else if(rTmp == cUserDefined) { rTmp += cUserSuffix; } @@ -162,11 +162,11 @@ static void lcl_ConvertTOUNameToUserName(OUString& rTmp) { ShellResource* pShellRes = SwViewShell::GetShellRes(); - if (rTmp.equalsAscii(cUserDefined)) + if (rTmp == cUserDefined) { rTmp = pShellRes->aTOXUserName; } - else if (!pShellRes->aTOXUserName.equalsAscii(cUserDefined) && + else if (pShellRes->aTOXUserName != cUserDefined && USER_AND_SUFFIXLEN == rTmp.getLength()) { //make sure that in non-English versions the " (user)" suffix is removed diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 8d98606950d7..7f2e84250da2 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -4087,11 +4087,11 @@ uno::Any SwXAutoStyles::getByName(const OUString& Name) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { uno::Any aRet; - if(Name.equalsAscii("CharacterStyles") ) + if(Name == "CharacterStyles") aRet = getByIndex(0); - else if(Name.equalsAscii("RubyStyles") ) + else if(Name == "RubyStyles") aRet = getByIndex(1); - else if(Name.equalsAscii("ParagraphStyles") ) + else if(Name == "ParagraphStyles") aRet = getByIndex(2); else throw container::NoSuchElementException(); @@ -4112,9 +4112,9 @@ uno::Sequence< OUString > SwXAutoStyles::getElementNames(void) sal_Bool SwXAutoStyles::hasByName(const OUString& Name) throw( uno::RuntimeException, std::exception ) { - if( Name.equalsAscii("CharacterStyles") || - Name.equalsAscii("RubyStyles") || - Name.equalsAscii("ParagraphStyles") ) + if( Name == "CharacterStyles" || + Name == "RubyStyles" || + Name == "ParagraphStyles" ) return sal_True; else return sal_False; diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index 5c5f6a5941b9..265cfbd3efc1 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -230,7 +230,7 @@ const SfxFilter* SwIoSystem::GetFileFilter(const OUString& rFileName) return pFilter; } - return SwIoSystem::GetFilterOfFormat(OUString::createFromAscii(FILTER_TEXT), 0); + return SwIoSystem::GetFilterOfFormat(FILTER_TEXT, 0); } bool SwIoSystem::IsDetectableText(const sal_Char* pBuf, sal_uLong &rLen, diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx index eff1b23497f0..9c562d24e176 100644 --- a/sw/source/filter/html/SwAppletImpl.cxx +++ b/sw/source/filter/html/SwAppletImpl.cxx @@ -50,8 +50,7 @@ SwHtmlOptType SwApplet_Impl::GetOptionType( const OUString& rName, bool bApplet rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_alt ) ) nType = SwHtmlOptType::IGNORE; else if( bApplet && - (rName.equalsIgnoreAsciiCaseAscii( sHTML_O_archive ) || - rName.equalsIgnoreAsciiCaseAscii( sHTML_O_Archives )) ) + (rName == sHTML_O_archive || rName == sHTML_O_Archives ) ) nType = SwHtmlOptType::TAG; break; case 'C': @@ -86,7 +85,7 @@ SwHtmlOptType SwApplet_Impl::GetOptionType( const OUString& rName, bool bApplet break; case 'O': case 'o': - if( bApplet && rName.equalsIgnoreAsciiCaseAscii( sHTML_O_Object ) ) + if( bApplet && rName == sHTML_O_Object ) nType = SwHtmlOptType::TAG; break; case 'S': diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index a2353c6af74e..04a9d7122781 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -589,17 +589,17 @@ sal_uInt16 SwCSS1Parser::GetScriptFromClass( OUString& rClass, switch( nLen ) { case 3: - if( rClass.matchIgnoreAsciiCaseAsciiL( "cjk", 3, nPos ) ) + if( rClass.matchIgnoreAsciiCase( "cjk", nPos ) ) { nScriptFlags = CSS1_SCRIPT_CJK; } - else if( rClass.matchIgnoreAsciiCaseAsciiL( "ctl", 3, nPos ) ) + else if( rClass.matchIgnoreAsciiCase( "ctl", nPos ) ) { nScriptFlags = CSS1_SCRIPT_CTL; } break; case 7: - if( rClass.matchIgnoreAsciiCaseAsciiL( "western", 7, nPos ) ) + if( rClass.matchIgnoreAsciiCase( "western", nPos ) ) { nScriptFlags = CSS1_SCRIPT_WESTERN; } diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index c8a3c0bb87bf..2ada3837ce30 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -764,7 +764,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, const OUString& rVal = *(OUString*)aTmp.getValue(); if( rVal.isEmpty() ) bEmptyValue = true; - else if( !rVal.equalsAscii( OOO_STRING_SVTOOLS_HTML_on ) ) + else if( rVal != OOO_STRING_SVTOOLS_HTML_on ) sValue = rVal; } break; @@ -1204,7 +1204,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( i < nValCnt ) { const OUString& rVal = pValues[i]; - if( rVal.equalsAscii( "$$$empty$$$" ) ) + if( rVal == "$$$empty$$$" ) bEmptyVal = true; else sVal = rVal; diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 693bebab1be5..9adfbb84a758 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -375,7 +375,7 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell, if( !sUIName2.isEmpty() ) { const sal_Int32 nFilter = m_pFilterLB->InsertEntry( sUIName2 ); - if( sFilter.equalsAscii("writer8") ) + if( sFilter == "writer8" ) nODT = nFilter; m_pFilterLB->SetEntryData( nFilter, new OUString( sFilter ) ); } diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx index 0531edbf8512..29ae1c5eeb27 100644 --- a/sw/source/ui/vba/vbaaddins.cxx +++ b/sw/source/ui/vba/vbaaddins.cxx @@ -44,7 +44,7 @@ static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const u for( sal_Int32 index = 0; index < nEntry; ++index ) { OUString sUrl = sEntries[ index ]; - if( !xSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) ) + if( !xSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCase( ".dot" ) ) { maAddins.push_back( uno::Reference< word::XAddin >( new SwVbaAddin( xParent, xContext, sUrl, true ) ) ); } diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 330e033bba94..05914a78b074 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -394,19 +394,19 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) if( SfxItemState::SET == pArgs->GetItemState(SID_STYLE_FAMILYNAME, false, &pItem )) { OUString aFamily = static_cast(pItem)->GetValue(); - if(aFamily.equalsAscii("CharacterStyles")) + if(aFamily == "CharacterStyles") nFamily = SFX_STYLE_FAMILY_CHAR; else - if(aFamily.equalsAscii("ParagraphStyles")) + if(aFamily == "ParagraphStyles") nFamily = SFX_STYLE_FAMILY_PARA; else - if(aFamily.equalsAscii("PageStyles")) + if(aFamily == "PageStyles") nFamily = SFX_STYLE_FAMILY_PAGE; else - if(aFamily.equalsAscii("FrameStyles")) + if(aFamily == "FrameStyles") nFamily = SFX_STYLE_FAMILY_FRAME; else - if(aFamily.equalsAscii("NumberingStyles")) + if(aFamily == "NumberingStyles") nFamily = SFX_STYLE_FAMILY_PSEUDO; } diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index 049cf028e4df..5364393870d7 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -1092,7 +1092,7 @@ void SwInsertConfig::Load() //#i61007# initialize caption order, right now only HUNGARIAN seems to need a different order SvtSysLocaleOptions aSysLocaleOptions; OUString sLang = aSysLocaleOptions.GetLocaleConfigString(); - bCaptionOrderNumberingFirst = !sLang.isEmpty() && sLang.matchAsciiL( "hu", 2 ); + bCaptionOrderNumberingFirst = sLang.startsWith( "hu" ); } } diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 7b97da3e0836..6005d42dc9b0 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1165,7 +1165,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, //convert fields to text if we are exporting to PDF //this prevents a second merge while updating the fields in SwXTextDocument::getRendererCount() - if( pStoreToFilter && pStoreToFilter->GetFilterName().equalsAscii("writer_pdf_Export")) + if( pStoreToFilter && pStoreToFilter->GetFilterName() == "writer_pdf_Export") rWorkShell.ConvertFieldsToText(); xWorkDocSh->DoSaveAs(*pDstMed); xWorkDocSh->DoSaveCompleted(pDstMed); diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 798c167dacd5..8142dfc90685 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -635,11 +635,11 @@ uno::Any SwConnectionContext::getValueByName( const OUString& rName ) throw (uno::RuntimeException, std::exception) { uno::Any aRet; - if( rName.equalsAscii( "ServerName" )) + if( rName == "ServerName" ) aRet <<= m_sMailServer; - else if( rName.equalsAscii( "Port" )) + else if( rName == "Port" ) aRet <<= (sal_Int32) m_nPort; - else if( rName.equalsAscii( "ConnectionType" )) + else if( rName == "ConnectionType" ) aRet <<= m_sConnectionType; return aRet; } diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 3fdcc451a3ce..56c148b939f5 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -1083,43 +1083,43 @@ void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue const Any& rVal = pProperties[i].Value; bool bException; sal_uInt32 nVal = lcl_Any_To_ULONG(rVal, bException); - if( sName.equalsAscii("PageRows" ) ) + if( sName == "PageRows" ) { if(!nVal || nVal > 0xff) throw RuntimeException(); aData.SetRow((sal_uInt8)nVal); } - else if(sName.equalsAscii("PageColumns")) + else if(sName == "PageColumns") { if(!nVal || nVal > 0xff) throw RuntimeException(); aData.SetCol((sal_uInt8)nVal); } - else if(sName.equalsAscii("LeftMargin")) + else if(sName == "LeftMargin") { aData.SetLeftSpace(convertMm100ToTwip(nVal)); } - else if(sName.equalsAscii("RightMargin")) + else if(sName == "RightMargin") { aData.SetRightSpace(convertMm100ToTwip(nVal)); } - else if(sName.equalsAscii("TopMargin")) + else if(sName == "TopMargin") { aData.SetTopSpace(convertMm100ToTwip(nVal)); } - else if(sName.equalsAscii("BottomMargin")) + else if(sName == "BottomMargin") { aData.SetBottomSpace(convertMm100ToTwip(nVal)); } - else if(sName.equalsAscii("HoriMargin")) + else if(sName == "HoriMargin") { aData.SetHorzSpace(convertMm100ToTwip(nVal)); } - else if(sName.equalsAscii("VertMargin")) + else if(sName == "VertMargin") { aData.SetVertSpace(convertMm100ToTwip(nVal)); } - else if(sName.equalsAscii("IsLandscape")) + else if(sName == "IsLandscape") { bException = (::getBooleanCppuType() != rVal.getValueType()); aData.SetLandscape(*(sal_Bool*)rVal.getValue()); @@ -1751,7 +1751,7 @@ Sequence< OUString > SwXTextDocument::getAvailableServiceNames(void) OUString* pRet = aRet.getArray(); for ( sal_Int32 i = 0; i < aRet.getLength(); ++i ) { - if ( pRet[i].equalsAscii( "com.sun.star.drawing.OLE2Shape" ) ) + if ( pRet[i] == "com.sun.star.drawing.OLE2Shape" ) { pRet[i] = pRet[aRet.getLength() - 1]; aRet.realloc( aRet.getLength() - 1 ); // no longer valid. -- cgit