Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2837
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/2837/1
Remove RTL_CONSTASCII_(U)STRINGPARAM in sw (2)
Change-Id: I5f84d997855321145179a9d6198a0d093dc62a95
---
M sw/source/core/crsr/bookmrk.cxx
M sw/source/core/crsr/crossrefbookmark.cxx
M sw/source/core/layout/dbg_lay.cxx
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index dde7b14..09f3438 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -162,12 +162,12 @@
OUString MarkBase::ToString( ) const
{
OUStringBuffer buf;
- buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("Mark: ( Name, [ Node1,
Index1 ] ): ( "));
- buf.append( m_aName ).appendAscii(RTL_CONSTASCII_STRINGPARAM(", [ "));
+ buf.append("Mark: ( Name, [ Node1, Index1 ] ): ( ");
+ buf.append( m_aName ).append(", [ ");
buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) )
- .appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+ .append(", ");
buf.append( sal_Int32( GetMarkPos().nContent.GetIndex( ) ) )
- .appendAscii(RTL_CONSTASCII_STRINGPARAM(" ] )") );
+ .append(" ] )");
return buf.makeStringAndClear( );
}
@@ -307,18 +307,18 @@
OUString Fieldmark::ToString( ) const
{
OUStringBuffer buf;
- buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(
- "Fieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): ( "));
- buf.append( m_aName ).appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
- buf.append( m_aFieldname ).appendAscii(RTL_CONSTASCII_STRINGPARAM(", [
"));
+ buf.append(
+ "Fieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): ( ");
+ buf.append( m_aName ).append(", ");
+ buf.append( m_aFieldname ).append(", [ ");
buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) )
- .appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+ .append(", ");
buf.append( sal_Int32( GetMarkPos( ).nContent.GetIndex( ) ) )
- .appendAscii(RTL_CONSTASCII_STRINGPARAM(" ], ["));
+ .append(" ], [");
buf.append( sal_Int32( GetOtherMarkPos().nNode.GetIndex( ) ) )
- .appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+ .append(", ");
buf.append( sal_Int32( GetOtherMarkPos( ).nContent.GetIndex( ) ) )
- .appendAscii(RTL_CONSTASCII_STRINGPARAM(" ] ) "));
+ .append(" ] ) ");
return buf.makeStringAndClear( );
}
@@ -388,18 +388,18 @@
OUString CheckboxFieldmark::toString( ) const
{
OUStringBuffer buf;
- buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(
- "CheckboxFieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): (
"));
- buf.append( m_aName ).appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
- buf.append( GetFieldname() ).appendAscii(RTL_CONSTASCII_STRINGPARAM(",
[ "));
+ buf.append(
+ "CheckboxFieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): (
");
+ buf.append( m_aName ).append(", ");
+ buf.append( GetFieldname() ).append(", [ ");
buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) )
- .appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+ .append(", ");
buf.append( sal_Int32( GetMarkPos( ).nContent.GetIndex( ) ) )
- .appendAscii(RTL_CONSTASCII_STRINGPARAM(" ], ["));
+ .append(" ], [");
buf.append( sal_Int32( GetOtherMarkPos().nNode.GetIndex( ) ) )
- .appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+ .append(", ");
buf.append( sal_Int32( GetOtherMarkPos( ).nContent.GetIndex( ) ) )
- .appendAscii(RTL_CONSTASCII_STRINGPARAM(" ] ) "));
+ .append(" ] ) ");
return buf.makeStringAndClear( );
}
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx
b/sw/source/core/crsr/crossrefbookmark.cxx
index 88452bf..0e8a08d 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -72,7 +72,7 @@
bool CrossRefHeadingBookmark::IsLegalName(const ::rtl::OUString& rName)
{
- return
rName.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(CrossRefHeadingBookmark_NamePrefix));
+ return rName.match(CrossRefHeadingBookmark_NamePrefix);
}
const char CrossRefNumItemBookmark_NamePrefix[] = "__RefNumPara__";
@@ -86,7 +86,7 @@
bool CrossRefNumItemBookmark::IsLegalName(const ::rtl::OUString& rName)
{
- return
rName.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(CrossRefNumItemBookmark_NamePrefix));
+ return rName.match(CrossRefNumItemBookmark_NamePrefix);
}
}}
diff --git a/sw/source/core/layout/dbg_lay.cxx
b/sw/source/core/layout/dbg_lay.cxx
index 44e9ffc..9f383dc 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -361,34 +361,34 @@
if( '[' == rLine[0] ) // section: FrmIds, type or funciton
{
rtl::OString aTmp = comphelper::string::getToken(rLine, 0, ']');
- if (aTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("[frmid"))) //
section FrmIds
+ if (aTmp == "[frmid") // section FrmIds
{
nInitFile = 1;
pFrmIds->clear();
delete pFrmIds;
pFrmIds = NULL; // default: log all frames
}
- else if (aTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("[frmtype")))//
section types
+ else if (aTmp == "[frmtype")// section types
{
nInitFile = 2;
nTypes = USHRT_MAX; // default: log all frame types
}
- else if (aTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("[record")))//
section functions
+ else if (aTmp == "[record")// section functions
{
nInitFile = 3;
SwProtocol::SetRecord( 0 );// default: don't log any function
}
- else if (aTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("[test")))// section
functions
+ else if (aTmp == "[test")// section functions
{
nInitFile = 4; // default:
nTestMode = 0; // log outside of test formating
}
- else if (aTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("[max")))// Max
number of lines
+ else if (aTmp == "[max")// Max number of lines
{
nInitFile = 5; // default:
nMaxLines = USHRT_MAX;
}
- else if (aTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("[var")))// variables
+ else if (aTmp == "[var")// variables
{
nInitFile = 6;
}
--
To view, visit https://gerrit.libreoffice.org/2837
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f84d997855321145179a9d6198a0d093dc62a95
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith <chrrossman...@web.de>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
