summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-10-16 21:12:30 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-10-17 09:18:18 +0100
commitc975d6b751c48471d413b2e15ccb86e742e9e231 (patch)
treeb33c8c23e4f379d30b421af134fe0ec99ea91e15 /sw
parente3c461104057fde8bcfc5778b24039ff387c4926 (diff)
Related: fdo#38838 remove String::CompareToAscii
Change-Id: Ie853747ec693bce34e5be3940c236be5e5544b00
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/unocore/unocoll.cxx7
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx1
2 files changed, 3 insertions, 5 deletions
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 2807f5b70725..a5d86ef914eb 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -1543,19 +1543,18 @@ uno::Sequence< OUString > SwXTextSections::getElementNames(void)
return aSeq;
}
-sal_Bool SwXTextSections::hasByName(const OUString& Name)
+sal_Bool SwXTextSections::hasByName(const OUString& rName)
throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
- String aName(Name);
if(IsValid())
{
SwSectionFmts& rFmts = GetDoc()->GetSections();
for(sal_uInt16 i = 0; i < rFmts.size(); i++)
{
const SwSectionFmt* pFmt = rFmts[i];
- if (aName == pFmt->GetSection()->GetSectionName())
+ if (rName == pFmt->GetSection()->GetSectionName())
{
bRet = sal_True;
break;
@@ -1565,7 +1564,7 @@ sal_Bool SwXTextSections::hasByName(const OUString& Name)
else
{
//Sonderbehandlung der dbg_ - Methoden
- if( COMPARE_EQUAL != aName.CompareToAscii("dbg_", 4))
+ if( !rName.startsWith("dbg_"))
throw uno::RuntimeException();
}
return bRet;
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 5b4c1156fe82..712dfab99a31 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -29,7 +29,6 @@
#include <algorithm>
#include <tools/solar.h> // UINTXX
#include <tools/stream.hxx>
-#include <tools/string.hxx>
#include "rtl/ustring.hxx"
#include "hash_wrap.hxx"
#include "sortedarray.hxx"