summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-20 13:18:33 +0200
committerNoel Grandin <noel@peralex.com>2013-11-20 13:56:08 +0200
commitacebbee971136e6ee0a7bc75bd57d937d6e1c295 (patch)
treef56fec189343e1d9297918037b55263733243d7b /sw
parentd894fee80e40519cb579987b95cb3d19345dfa71 (diff)
remove RTL_CONSTASCII_STRINGPARAM in OString::equalsL calls
Convert code like: if (aByteStr.equalsL(RTL_CONSTASCII_STRINGPARAM("rem"))) to: if (aByteStr.startsWith("rem")) Change-Id: I09e40b3fdc87d59a8176c2a5f39cc6aa5cf5a576
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/html/htmlatr.cxx18
-rw-r--r--sw/source/ui/misc/numberingtypelistbox.cxx2
-rw-r--r--sw/source/ui/vba/vbasystem.cxx10
3 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 8e0333d20843..9ef44e797ddd 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -543,13 +543,13 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// der erste Buchstabe reicht meistens
switch( rInfo.aToken[0] )
{
- case 'A': OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_address)),
+ case 'A': OSL_ENSURE( rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_address),
"Doch kein ADDRESS?" );
rInfo.bParaPossible = sal_True;
rHWrt.bNoAlign = sal_True;
break;
- case 'B': OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_blockquote)),
+ case 'B': OSL_ENSURE( rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_blockquote),
"Doch kein BLOCKQUOTE?" );
rInfo.bParaPossible = sal_True;
rHWrt.bNoAlign = sal_True;
@@ -561,7 +561,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
}
else
{
- OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_preformtxt)),
+ OSL_ENSURE( rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_preformtxt),
"Doch kein PRE?" );
if( HTML_PREFORMTXT_ON == rHWrt.nLastParaToken )
{
@@ -576,10 +576,10 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
}
break;
- case 'D': OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dt)) ||
- rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dd)),
+ case 'D': OSL_ENSURE( rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_dt) ||
+ rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_dd),
"Doch kein DD/DT?" );
- bDT = rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dt));
+ bDT = rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_dt);
rInfo.bParaPossible = !bDT;
rHWrt.bNoAlign = sal_True;
bForceDL = sal_True;
@@ -1031,9 +1031,9 @@ void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo )
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rInfo.aToken.getStr(),
sal_False );
rHWrt.bLFPossible =
- !rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dt)) &&
- !rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dd)) &&
- !rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_li));
+ !rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_dt) &&
+ !rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_dd) &&
+ !rInfo.aToken.startsWith(OOO_STRING_SVTOOLS_HTML_li);
}
if( rInfo.bOutDiv )
{
diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx
index 224dab5a4f3a..51247ef0dc06 100644
--- a/sw/source/ui/misc/numberingtypelistbox.cxx
+++ b/sw/source/ui/misc/numberingtypelistbox.cxx
@@ -48,7 +48,7 @@ SwNumberingTypeListBox::SwNumberingTypeListBox( Window* pWin, WinBits nStyle ) :
bool SwNumberingTypeListBox::set_property(const OString &rKey, const OString &rValue)
{
- if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("type")))
+ if (rKey.startsWith("type"))
Reload(rValue.toInt32());
else
return ListBox::set_property(rKey, rValue);
diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx
index 6ca213bce526..ece2f6c83291 100644
--- a/sw/source/ui/vba/vbasystem.cxx
+++ b/sw/source/ui/vba/vbasystem.cxx
@@ -57,23 +57,23 @@ void lcl_getRegKeyInfo( const OString& sKeyInfo, HKEY& hBaseKey, OString& sSubKe
{
OString sBaseKey = sKeyInfo.copy( 0, nBaseKeyIndex );
sSubKey = sKeyInfo.copy( nBaseKeyIndex + 1 );
- if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_CURRENT_USER")) )
+ if( sBaseKey.startsWith("HKEY_CURRENT_USER") )
{
hBaseKey = HKEY_CURRENT_USER;
}
- else if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_LOCAL_MACHINE")) )
+ else if( sBaseKey.startsWith("HKEY_LOCAL_MACHINE") )
{
hBaseKey = HKEY_LOCAL_MACHINE;
}
- else if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_CLASSES_ROOT")) )
+ else if( sBaseKey.startsWith("HKEY_CLASSES_ROOT") )
{
hBaseKey = HKEY_CLASSES_ROOT;
}
- else if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_USERS")) )
+ else if( sBaseKey.startsWith("HKEY_USERS") )
{
hBaseKey = HKEY_USERS;
}
- else if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_CURRENT_CONFIG")) )
+ else if( sBaseKey.startsWith("HKEY_CURRENT_CONFIG") )
{
hBaseKey = HKEY_CURRENT_CONFIG;
}