[Libreoffice-commits] core.git: 6 commits - comphelper/source connectivity/source cppcanvas/source dbaccess/source drawinglayer/source editeng/source extensions/source filter/source idl/source l10ntools/source linguistic/source odk/examples reportdesign/source rsc/source sal/qa sax/source sc/source sdext/source sfx2/source slideshow/source svtools/source svx/source sw/source ucb/source vcl/unx
Noel Grandin
noel at peralex.com
Wed Nov 20 03:57:35 PST 2013
comphelper/source/misc/syntaxhighlight.cxx | 2
connectivity/source/drivers/hsqldb/HDriver.cxx | 4
connectivity/source/drivers/mysql/YDriver.cxx | 6
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 8 -
connectivity/source/drivers/postgresql/pq_driver.cxx | 2
connectivity/source/drivers/postgresql/pq_tools.cxx | 2
connectivity/source/drivers/postgresql/pq_xcolumns.cxx | 2
cppcanvas/source/mtfrenderer/implrenderer.cxx | 6
dbaccess/source/ui/dlg/dbfindex.cxx | 8 -
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 22 +--
editeng/source/editeng/editeng.cxx | 3
extensions/source/plugin/unx/unxmgr.cxx | 4
extensions/source/scanner/sanedlg.cxx | 13 -
extensions/source/update/check/download.cxx | 10 -
filter/source/placeware/exporter.cxx | 2
idl/source/cmptools/lex.cxx | 4
idl/source/objects/module.cxx | 6
idl/source/objects/slot.cxx | 10 -
l10ntools/source/cfgmerge.cxx | 2
l10ntools/source/export.cxx | 30 ++--
linguistic/source/dicimp.cxx | 4
odk/examples/cpp/custompanel/ctp_factory.cxx | 2
reportdesign/source/filter/xml/xmlfilter.cxx | 3
rsc/source/res/rscall.cxx | 12 -
sal/qa/osl/file/osl_File.cxx | 2
sax/source/tools/fastattribs.cxx | 2
sc/source/core/data/dptabres.cxx | 3
sc/source/filter/lotus/lotform.cxx | 71 ++++------
sc/source/filter/oox/numberformatsbuffer.cxx | 6
sc/source/filter/qpro/qproform.cxx | 2
sc/source/filter/xml/xmlwrap.cxx | 15 --
sc/source/ui/Accessibility/DrawModelBroadcaster.cxx | 3
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 8 -
sfx2/source/appl/appcfg.cxx | 4
sfx2/source/appl/appuno.cxx | 20 +-
sfx2/source/appl/sfxhelp.cxx | 2
sfx2/source/bastyp/mieclip.cxx | 10 -
sfx2/source/control/request.cxx | 9 -
sfx2/source/control/unoctitm.cxx | 2
sfx2/source/dialog/taskpane.cxx | 2
slideshow/source/engine/shapes/drawshapesubsetting.cxx | 4
slideshow/source/engine/shapes/gdimtftools.cxx | 4
svtools/source/contnr/fileview.cxx | 2
svx/source/customshapes/EnhancedCustomShape2d.cxx | 2
svx/source/svdraw/svdmodel.cxx | 3
svx/source/xml/xmlgrhlp.cxx | 2
sw/source/filter/html/htmlatr.cxx | 18 +-
sw/source/filter/html/htmltabw.cxx | 4
sw/source/filter/xml/swxml.cxx | 15 --
sw/source/ui/misc/numberingtypelistbox.cxx | 2
sw/source/ui/vba/vbasystem.cxx | 10 -
ucb/source/ucp/webdav/DAVProperties.cxx | 4
vcl/unx/generic/printer/jobdata.cxx | 20 +-
vcl/unx/generic/printer/ppdparser.cxx | 26 +--
vcl/unx/generic/printer/printerinfomanager.cxx | 14 -
55 files changed, 213 insertions(+), 245 deletions(-)
New commits:
commit f8b22654197178a441d383398b515bb2fb6deaf2
Author: Noel Grandin <noel at peralex.com>
Date: Wed Nov 20 13:46:07 2013 +0200
remove RTL_CONSTASCII_STRINGPARAM in OUString::matchAsciiL calls
Convert code like:
defaultValue.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "nextval(" ) );
to:
defaultValue.startsWith( "nextval(" );
Change-Id: I77bdcbf46bec6ded3c16a8248634b1424a1eb4f0
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index 50d0e3a..10af859 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -319,9 +319,9 @@ namespace connectivity
{
Sequence< PropertyValue > info;
- sal_Bool bOK = url.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "sdbc:mysql:odbc:" ) )
- || url.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "sdbc:mysql:jdbc:" ) )
- || ( url.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "sdbc:mysql:mysqlc:" ) )
+ sal_Bool bOK = url.startsWith( "sdbc:mysql:odbc:" )
+ || url.startsWith( "sdbc:mysql:jdbc:" )
+ || ( url.startsWith( "sdbc:mysql:mysqlc:" )
&& loadDriver( url, info ).is()
);
return bOK;
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 9a502a0..11e36b3 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1235,16 +1235,16 @@ struct SortInternalSchemasLastAndPublicFirst
{
ret = false;
}
- else if( valueA.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "pg_" ) ) &&
- valueB.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "pg_" ) ) )
+ else if( valueA.startsWith( "pg_" ) &&
+ valueB.startsWith( "pg_" ) )
{
ret = valueA.compareTo( valueB ) < 0; // sorts equal !
}
- else if( valueA.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "pg_" ) ))
+ else if( valueA.startsWith( "pg_" ))
{
ret = false; // sorts last !
}
- else if( valueB.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "pg_" ) ) )
+ else if( valueB.startsWith( "pg_" ) )
{
ret = true; // sorts first !
}
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index 5f1fedb..d2742ec 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -119,7 +119,7 @@ Reference< XConnection > Driver::connect(
sal_Bool Driver::acceptsURL( const OUString& url )
throw (SQLException, RuntimeException)
{
- return url.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "sdbc:postgresql:" ) );
+ return url.startsWith( "sdbc:postgresql:" );
}
Sequence< DriverPropertyInfo > Driver::getPropertyInfo(
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index a3dccb4..a7ec888 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -94,7 +94,7 @@ static Any isCurrency( const OUString & typeName )
static Any isAutoIncrement( const OUString & defaultValue )
{
- sal_Bool ret = defaultValue.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "nextval(" ) );
+ sal_Bool ret = defaultValue.startsWith( "nextval(" );
// printf( "%s %d\n",
// OUStringToOString(defaultValue, RTL_TEXTENCODING_ASCII_US).getStr(),
// ret );
diff --git a/odk/examples/cpp/custompanel/ctp_factory.cxx b/odk/examples/cpp/custompanel/ctp_factory.cxx
index 2915c85..9c8d5c5 100644
--- a/odk/examples/cpp/custompanel/ctp_factory.cxx
+++ b/odk/examples/cpp/custompanel/ctp_factory.cxx
@@ -67,7 +67,7 @@ namespace sd { namespace colortoolpanel
{
::osl::MutexGuard aGuard( m_aMutex );
- if ( !i_rResourceURL.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:resource/toolpanel/org.openoffice.example.colorpanel/" ) ) )
+ if ( !i_rResourceURL.startsWith( "private:resource/toolpanel/org.openoffice.example.colorpanel/" ) )
throw NoSuchElementException( i_rResourceURL, *this );
const OUString sColor( i_rResourceURL.copy( i_rResourceURL.lastIndexOf( '/' ) + 1 ) );
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index 8231640..84f44a2 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -1850,9 +1850,9 @@ sal_Int32 lclCreateFormat( const Reference< XNumberFormats >& rxNumFmts,
else
{
// do not assert fractional number formats with fixed denominator
- OSL_ENSURE( rFmtCode.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "#\\ ?/" ) ) ||
- rFmtCode.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "#\\ ?\?/" ) ) ||
- rFmtCode.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "#\\ ?\?\?/" ) ),
+ OSL_ENSURE( rFmtCode.startsWith( "#\\ ?/" ) ||
+ rFmtCode.startsWith( "#\\ ?\?/" ) ||
+ rFmtCode.startsWith( "#\\ ?\?\?/" ),
OStringBuffer( "lclCreateFormat - cannot create number format '" ).
append( OUStringToOString( rFmtCode, osl_getThreadTextEncoding() ) ).
append( '\'' ).getStr() );
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 12a7b1d..9ac3dbf 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -572,7 +572,7 @@ namespace sfx2
//------------------------------------------------------------------------------------------------------------------
bool ModuleTaskPane_Impl::impl_isToolPanelResource( const OUString& i_rResourceURL )
{
- return i_rResourceURL.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:resource/toolpanel/" ) );
+ return i_rResourceURL.startsWith( "private:resource/toolpanel/" );
}
//------------------------------------------------------------------------------------------------------------------
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 5665cc9..b3a780b 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1615,7 +1615,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
if ( pAny )
*pAny >>= sShpType;
if( sShpType.getLength() > 3 &&
- sShpType.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "mso" ))){
+ sShpType.startsWith( "mso" )){
bIsMSEllipse = true;
}
if( (! bIsDefaultPath && ! bIsDefaultViewBox) || (bIsDefaultViewBox && bIsMSEllipse) /*&& (nGeneratorVersion == SfxObjectShell::Sym_L2)*/ )
diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx
index 264e2a3..33b10a0 100644
--- a/ucb/source/ucp/webdav/DAVProperties.cxx
+++ b/ucb/source/ucp/webdav/DAVProperties.cxx
@@ -185,7 +185,7 @@ bool DAVProperties::isUCBSpecialProperty(const rtl::OUString& rFullName, rtl::OU
{
sal_Int32 nLen = rFullName.getLength();
if ( nLen <= 0 ||
- !rFullName.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "<prop:" ) ) ||
+ !rFullName.startsWith( "<prop:" ) ||
!rFullName.endsWithAsciiL( RTL_CONSTASCII_STRINGPARAM( "\">" ) ) )
return false;
@@ -199,7 +199,7 @@ bool DAVProperties::isUCBSpecialProperty(const rtl::OUString& rFullName, rtl::OU
return false;
// TODO skip whitespaces?
- if ( !rFullName.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "xmlns:prop=\"" ), ++nEnd ) )
+ if ( !rFullName.startsWith( RTL_CONSTASCII_STRINGPARAM( "xmlns:prop=\"" ), ++nEnd ) )
return false;
nStart = nEnd + RTL_CONSTASCII_LENGTH( "xmlns:prop=\"" );
commit 9cb0fc7801db40ab337c20591ec4674b941ba01a
Author: Noel Grandin <noel at peralex.com>
Date: Wed Nov 20 13:32:13 2013 +0200
fix spelling in comment
Change-Id: Icae96e2b64709b2a9aaf6a5576c29d9d5c8a9868
diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx
index 4b591a0..2297b1d 100644
--- a/sax/source/tools/fastattribs.cxx
+++ b/sax/source/tools/fastattribs.cxx
@@ -196,7 +196,7 @@ sal_Int32 FastTokenLookup::getTokenFromChars(
if ( static_cast<sal_Int32>(nLen) < mnUtf8BufferSize )
{
- // Get intimiate with the underlying sequence cf. sal/types.h
+ // Get intimate with the underlying sequence cf. sal/types.h
sal_Sequence *pSeq = maUtf8Buffer.get();
sal_Int32 nPreRefCount = pSeq->nRefCount;
commit 30ac3942b44b8f903180488f87e1df4e02ff88e8
Author: Noel Grandin <noel at peralex.com>
Date: Wed Nov 20 13:30:38 2013 +0200
remove RTL_CONSTASCII_STRINGPARAM in OString::matchL calls
Convert code like:
if (aValue.matchL(RTL_CONSTASCII_STRINGPARAM("BOOL=")))
to:
if (aValue.startsWith("BOOL="))
Change-Id: I385d10fd486d6a3e5f81f4a28088d913fc2f0d26
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index fbc0318..57fa03e 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -1200,18 +1200,18 @@ sal_Bool SaneDlg::LoadState()
if( nOption == -1 )
continue;
- if (aValue.matchL(RTL_CONSTASCII_STRINGPARAM("BOOL=")))
+ if (aValue.startsWith("BOOL="))
{
aValue = aValue.copy(RTL_CONSTASCII_LENGTH("BOOL="));
sal_Bool aBOOL = (sal_Bool)aValue.toInt32();
mrSane.SetOptionValue( nOption, aBOOL );
}
- else if (aValue.matchL(RTL_CONSTASCII_STRINGPARAM("STRING=")))
+ else if (aValue.startsWith("STRING="))
{
aValue = aValue.copy(RTL_CONSTASCII_LENGTH("STRING="));
mrSane.SetOptionValue(nOption,OStringToOUString(aValue, osl_getThreadTextEncoding()) );
}
- else if (aValue.matchL(RTL_CONSTASCII_STRINGPARAM("NUMERIC=")))
+ else if (aValue.startsWith("NUMERIC="))
{
aValue = aValue.copy(RTL_CONSTASCII_LENGTH("NUMERIC="));
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index 4b9756b..76c23b4 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -200,24 +200,24 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa
while( ! aStream.IsEof() )
{
aStream.ReadLine( aLine );
- if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM("JobData")))
+ if (aLine.startsWith("JobData"))
bVersion = true;
- else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(printerEquals)))
+ else if (aLine.startsWith(printerEquals))
{
bPrinter = true;
rJobData.m_aPrinterName = OStringToOUString(aLine.copy(RTL_CONSTASCII_LENGTH(printerEquals)), RTL_TEXTENCODING_UTF8);
}
- else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(orientatationEquals)))
+ else if (aLine.startsWith(orientatationEquals))
{
bOrientation = true;
rJobData.m_eOrientation = aLine.copy(RTL_CONSTASCII_LENGTH(orientatationEquals)).equalsIgnoreAsciiCase("landscape") ? orientation::Landscape : orientation::Portrait;
}
- else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(copiesEquals)))
+ else if (aLine.startsWith(copiesEquals))
{
bCopies = true;
rJobData.m_nCopies = aLine.copy(RTL_CONSTASCII_LENGTH(copiesEquals)).toInt32();
}
- else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(margindajustmentEquals)))
+ else if (aLine.startsWith(margindajustmentEquals))
{
bMargin = true;
OString aValues(aLine.copy(RTL_CONSTASCII_LENGTH(margindajustmentEquals)));
@@ -226,22 +226,22 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa
rJobData.m_nTopMarginAdjust = aValues.getToken(2, ',').toInt32();
rJobData.m_nBottomMarginAdjust = aValues.getToken(3, ',').toInt32();
}
- else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(colordepthEquals)))
+ else if (aLine.startsWith(colordepthEquals))
{
bColorDepth = true;
rJobData.m_nColorDepth = aLine.copy(RTL_CONSTASCII_LENGTH(colordepthEquals)).toInt32();
}
- else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(colordeviceEquals)))
+ else if (aLine.startsWith(colordeviceEquals))
{
bColorDevice = true;
rJobData.m_nColorDevice = aLine.copy(RTL_CONSTASCII_LENGTH(colordeviceEquals)).toInt32();
}
- else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(pslevelEquals)))
+ else if (aLine.startsWith(pslevelEquals))
{
bPSLevel = true;
rJobData.m_nPSLevel = aLine.copy(RTL_CONSTASCII_LENGTH(pslevelEquals)).toInt32();
}
- else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(pdfdeviceEquals)))
+ else if (aLine.startsWith(pdfdeviceEquals))
{
bPDFDevice = true;
rJobData.m_nPDFDevice = aLine.copy(RTL_CONSTASCII_LENGTH(pdfdeviceEquals)).toInt32();
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 35bea65..efd8ee9 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -994,7 +994,7 @@ void PPDParser::parse( ::std::list< OString >& rLines )
continue;
// default values are parsed in pass 2
- if (aKey.matchL(RTL_CONSTASCII_STRINGPARAM("Default")))
+ if (aKey.startsWith("Default"))
continue;
bool bQuery = false;
@@ -1174,7 +1174,7 @@ void PPDParser::parse( ::std::list< OString >& rLines )
for( line = rLines.begin(); line != rLines.end(); ++line )
{
OString aLine(*line);
- if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM("*Default")))
+ if (aLine.startsWith("*Default"))
{
OUString aKey(OStringToOUString(aLine.copy(8), RTL_TEXTENCODING_MS_1252));
sal_Int32 nPos = aKey.indexOf( ':' );
@@ -1204,8 +1204,8 @@ void PPDParser::parse( ::std::list< OString >& rLines )
}
}
}
- else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM("*UIConstraints")) ||
- aLine.matchL(RTL_CONSTASCII_STRINGPARAM("*NonUIConstraints")))
+ else if (aLine.startsWith("*UIConstraints") ||
+ aLine.startsWith("*NonUIConstraints"))
{
parseConstraint( aLine );
}
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index e9f7791..4f8f56e 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -315,7 +315,7 @@ void PrinterInfoManager::initialize()
for( int nKey = 0; nKey < aConfig.GetKeyCount(); ++nKey )
{
OString aKey( aConfig.GetKeyName( nKey ) );
- if (aKey.matchL(RTL_CONSTASCII_STRINGPARAM("PPD_")))
+ if (aKey.startsWith("PPD_"))
{
aValue = aConfig.ReadKey( aKey );
const PPDKey* pKey = m_aGlobalDefaults.m_pParser->getKey(OStringToOUString(aKey.copy(4), RTL_TEXTENCODING_ISO_8859_1));
@@ -327,7 +327,7 @@ void PrinterInfoManager::initialize()
sal_True );
}
}
- else if (aKey.matchL(RTL_CONSTASCII_STRINGPARAM("SubstFont_")))
+ else if (aKey.startsWith("SubstFont_"))
{
aValue = aConfig.ReadKey( aKey );
m_aGlobalDefaults.m_aFontSubstitutes[ OStringToOUString( aKey.copy( 10 ), RTL_TEXTENCODING_ISO_8859_1 ) ] = OStringToOUString( aValue, RTL_TEXTENCODING_ISO_8859_1 );
@@ -523,7 +523,7 @@ void PrinterInfoManager::initialize()
for( int nKey = 0; nKey < aConfig.GetKeyCount(); ++nKey )
{
OString aKey( aConfig.GetKeyName( nKey ) );
- if( aKey.matchL(RTL_CONSTASCII_STRINGPARAM("PPD_")) && aPrinter.m_aInfo.m_pParser )
+ if( aKey.startsWith("PPD_") && aPrinter.m_aInfo.m_pParser )
{
aValue = aConfig.ReadKey( aKey );
const PPDKey* pKey = aPrinter.m_aInfo.m_pParser->getKey(OStringToOUString(aKey.copy(4), RTL_TEXTENCODING_ISO_8859_1));
@@ -535,7 +535,7 @@ void PrinterInfoManager::initialize()
sal_True );
}
}
- else if( aKey.matchL(RTL_CONSTASCII_STRINGPARAM("SubstFont_")) )
+ else if( aKey.startsWith("SubstFont_") )
{
aValue = aConfig.ReadKey( aKey );
aPrinter.m_aInfo.m_aFontSubstitutes[ OStringToOUString( aKey.copy( 10 ), RTL_TEXTENCODING_ISO_8859_1 ) ] = OStringToOUString( aValue, RTL_TEXTENCODING_ISO_8859_1 );
commit acebbee971136e6ee0a7bc75bd57d937d6e1c295
Author: Noel Grandin <noel at peralex.com>
Date: Wed Nov 20 13:18:33 2013 +0200
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
diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx
index c9bac08..ce32660 100644
--- a/comphelper/source/misc/syntaxhighlight.cxx
+++ b/comphelper/source/misc/syntaxhighlight.cxx
@@ -368,7 +368,7 @@ sal_Bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /*
{
reType = TT_KEYWORDS;
- if (aByteStr.equalsL(RTL_CONSTASCII_STRINGPARAM("rem")))
+ if (aByteStr.startsWith("rem"))
{
// Remove all characters until end of line or EOF
sal_Unicode cPeek = *pos;
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 21ed0d2..af9c1ba 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -279,13 +279,13 @@ namespace connectivity
continue;
const OString sIniKey = comphelper::string::getToken(sLine, 0, '=');
const OString sValue = comphelper::string::getToken(sLine, 1, '=');
- if (sIniKey.equalsL(RTL_CONSTASCII_STRINGPARAM("hsqldb.compatible_version")))
+ if (sIniKey.startsWith("hsqldb.compatible_version"))
{
sVersionString = sValue;
}
else
{
- if (sIniKey.equalsL(RTL_CONSTASCII_STRINGPARAM("version"))
+ if (sIniKey.startsWith("version")
&& ( sVersionString.isEmpty() )
)
{
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index a8145bb..1b59ff2 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1653,7 +1653,7 @@ namespace cppcanvas
// XPATHSTROKE_SEQ_BEGIN comment
// Handle drawing layer fills
- else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) )
+ else if( pAct->GetComment().startsWith("XPATHFILL_SEQ_BEGIN") )
{
const sal_uInt8* pData = pAct->GetData();
if ( pData )
@@ -1769,7 +1769,7 @@ namespace cppcanvas
}
}
// Handle drawing layer fills
- else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EMF_PLUS")) ) {
+ else if( pAct->GetComment().startsWith("EMF_PLUS") ) {
static int count = -1, limit = 0x7fffffff;
if (count == -1) {
count = 0;
@@ -1782,7 +1782,7 @@ namespace cppcanvas
if (count < limit)
processEMFPlus( pAct, rFactoryParms, rStates.getState(), rCanvas );
count ++;
- } else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EMF_PLUS_HEADER_INFO")) ) {
+ } else if( pAct->GetComment().startsWith("EMF_PLUS_HEADER_INFO") ) {
SAL_INFO ("cppcanvas.emf", "EMF+ passed to canvas mtf renderer - header info, size: " << pAct->GetDataSize ());
SvMemoryStream rMF ((void*) pAct->GetData (), pAct->GetDataSize (), STREAM_READ);
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 644df94..c7c7689 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -352,7 +352,7 @@ void ODbaseIndexDialog::Init()
aNDX = aKeyName.copy(0,3);
// yes -> add to the tables index list
- if (aNDX.equalsL(RTL_CONSTASCII_STRINGPARAM("NDX")))
+ if (aNDX.startsWith("NDX"))
{
aEntry = OStringToOUString(aInfFile.ReadKey(aKeyName), osl_getThreadTextEncoding());
rTabInfo.aIndexList.push_back( OTableIndex( aEntry ) );
@@ -455,7 +455,7 @@ void OTableInfo::WriteInfFile( const OUString& rDSN ) const
aNDX = aKeyName.copy(0,3);
//...if yes, delete index file, nKey is at subsequent key
- if (aNDX.equalsL(RTL_CONSTASCII_STRINGPARAM("NDX")))
+ if (aNDX.startsWith("NDX"))
{
aInfFile.DeleteKey(aKeyName);
nKeyCnt--;
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index 2ee2b49..ca16599 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -66,7 +66,7 @@ static bool CheckPlugin( const OString& rPath, list< PluginDescription* >& rDesc
}
OString aBaseName = rPath.copy(nPos+1);
- if (aBaseName.equalsL(RTL_CONSTASCII_STRINGPARAM("libnullplugin.so")))
+ if (aBaseName.startsWith("libnullplugin.so"))
{
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "don't like %s\n", aBaseName.getStr() );
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 4d78be8..fd0d51b 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -1090,7 +1090,7 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName,
OString aMethodName( GetExecMethod() );
if ( !aMethodName.isEmpty() &&
- !aMethodName.equalsL(RTL_CONSTASCII_STRINGPARAM("NoExec")) )
+ !aMethodName.startsWith("NoExec") )
{
sal_Bool bIn = sal_False;
for( size_t n = 0; n < rList.size(); n++ )
@@ -1115,7 +1115,7 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName,
aMethodName = GetStateMethod();
if (!aMethodName.isEmpty() &&
- !aMethodName.equalsL(RTL_CONSTASCII_STRINGPARAM("NoState")))
+ !aMethodName.startsWith("NoState"))
{
sal_Bool bIn = sal_False;
for ( size_t n=0; n < rList.size(); n++ )
@@ -1252,7 +1252,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
// write ExecMethod, with standard name if not specified
if( !GetExecMethod().isEmpty() &&
- !GetExecMethod().equalsL(RTL_CONSTASCII_STRINGPARAM("NoExec")))
+ !GetExecMethod().startsWith("NoExec"))
{
rOutStm << "SFX_STUB_PTR(" << rShellName.getStr() << ','
<< GetExecMethod().getStr() << ')';
@@ -1263,7 +1263,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
// write StateMethod, with standard name if not specified
if( !GetStateMethod().isEmpty() &&
- !GetStateMethod().equalsL(RTL_CONSTASCII_STRINGPARAM("NoState")))
+ !GetStateMethod().startsWith("NoState"))
{
rOutStm << "SFX_STUB_PTR(" << rShellName.getStr() << ','
<< GetStateMethod().getStr() << ')';
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 4057167..b8618fc 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -507,18 +507,18 @@ int Export::Execute( int nToken, const char * pToken )
OString sValue = sToken.getToken(0, '=', n);
CleanValue( sValue );
sKey = sKey.toAsciiUpperCase();
- if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("IDENTIFIER")))
+ if (sKey.startsWith("IDENTIFIER"))
{
OString sId(
sValue.replaceAll("\t", OString()).
replaceAll(" ", OString()));
pResData->SetId(sId, ID_LEVEL_IDENTIFIER);
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HELPID")))
+ else if (sKey.startsWith("HELPID"))
{
pResData->sHelpId = sValue;
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("STRINGLIST")))
+ else if (sKey.startsWith("STRINGLIST"))
{
pResData->bList = sal_True;
nList = LIST_STRING;
@@ -526,7 +526,7 @@ int Export::Execute( int nToken, const char * pToken )
nListIndex = 0;
nListLevel = 0;
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("FILTERLIST")))
+ else if (sKey.startsWith("FILTERLIST"))
{
pResData->bList = sal_True;
nList = LIST_FILTER;
@@ -534,7 +534,7 @@ int Export::Execute( int nToken, const char * pToken )
nListIndex = 0;
nListLevel = 0;
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIENTRIES")))
+ else if (sKey.startsWith("UIENTRIES"))
{
pResData->bList = sal_True;
nList = LIST_UIENTRIES;
@@ -564,7 +564,7 @@ int Export::Execute( int nToken, const char * pToken )
OString sValue = sToken.getToken(1, '=');
CleanValue( sValue );
sKey = sKey.toAsciiUpperCase();
- if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("STRINGLIST")))
+ if (sKey.startsWith("STRINGLIST"))
{
pResData->bList = sal_True;
nList = LIST_STRING;
@@ -572,7 +572,7 @@ int Export::Execute( int nToken, const char * pToken )
nListIndex = 0;
nListLevel = 0;
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("FILTERLIST")))
+ else if (sKey.startsWith("FILTERLIST"))
{
pResData->bList = sal_True;
nList = LIST_FILTER;
@@ -580,7 +580,7 @@ int Export::Execute( int nToken, const char * pToken )
nListIndex = 0;
nListLevel = 0;
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("PAIREDLIST")))
+ else if (sKey.startsWith("PAIREDLIST"))
{
pResData->bList = sal_True;
nList = LIST_PAIRED;
@@ -588,7 +588,7 @@ int Export::Execute( int nToken, const char * pToken )
nListIndex = 0;
nListLevel = 0;
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("ITEMLIST")))
+ else if (sKey.startsWith("ITEMLIST"))
{
pResData->bList = sal_True;
nList = LIST_ITEM;
@@ -596,7 +596,7 @@ int Export::Execute( int nToken, const char * pToken )
nListIndex = 0;
nListLevel = 0;
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIENTRIES")))
+ else if (sKey.startsWith("UIENTRIES"))
{
pResData->bList = sal_True;
nList = LIST_UIENTRIES;
@@ -648,11 +648,11 @@ int Export::Execute( int nToken, const char * pToken )
if ( !sText.isEmpty() && !sLang.isEmpty() )
{
sKey = sKey.toAsciiUpperCase();
- if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("TEXT")) ||
- sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("MESSAGE")) ||
- sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("CUSTOMUNITTEXT")) ||
- sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("SLOTNAME")) ||
- sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UINAME")))
+ if (sKey.startsWith("TEXT") ||
+ sKey.startsWith("MESSAGE") ||
+ sKey.startsWith("CUSTOMUNITTEXT") ||
+ sKey.startsWith("SLOTNAME") ||
+ sKey.startsWith("UINAME"))
{
SetChildWithText();
if ( sLangIndex.equalsIgnoreAsciiCase("en-US") )
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 7000cd0..e91d66b 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -117,7 +117,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNe
// lang: field
if (getTag(aLine, "lang: ", aTagValue))
{
- if (aTagValue.equalsL(RTL_CONSTASCII_STRINGPARAM("<none>")))
+ if (aTagValue.startsWith("<none>"))
nLng = LANGUAGE_NONE;
else
nLng = LanguageTag::convertToLanguageTypeWithFallback(
@@ -127,7 +127,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNe
// type: negative / positive
if (getTag(aLine, "type: ", aTagValue))
{
- if (aTagValue.equalsL(RTL_CONSTASCII_STRINGPARAM("negative")))
+ if (aTagValue.startsWith("negative"))
bNeg = sal_True;
else
bNeg = sal_False;
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index c230710..5bea268 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -1976,71 +1975,71 @@ static DefTokenId lcl_KnownAddIn( const OString& rTest )
{
DefTokenId eId = ocNoName;
- if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("FACT")))
+ if (rTest.startsWith("FACT"))
eId = ocFact;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ISEMPTY")))
+ else if (rTest.startsWith("ISEMPTY"))
eId=ocIsEmpty;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("DEGTORAD")))
+ else if (rTest.startsWith("DEGTORAD"))
eId=ocRad;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("RADTODEG")))
+ else if (rTest.startsWith("RADTODEG"))
eId=ocDeg;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("SIGN")))
+ else if (rTest.startsWith("SIGN"))
eId=ocPlusMinus;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ACOSH")))
+ else if (rTest.startsWith("ACOSH"))
eId=ocArcCosHyp;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ACOTH")))
+ else if (rTest.startsWith("ACOTH"))
eId=ocArcCotHyp;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ASINH")))
+ else if (rTest.startsWith("ASINH"))
eId=ocArcSinHyp;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ATANH")))
+ else if (rTest.startsWith("ATANH"))
eId=ocArcTanHyp;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COSH")))
+ else if (rTest.startsWith("COSH"))
eId=ocCosHyp;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COTH")))
+ else if (rTest.startsWith("COTH"))
eId=ocCotHyp;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("SINH")))
+ else if (rTest.startsWith("SINH"))
eId=ocSinHyp;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("TANH")))
+ else if (rTest.startsWith("TANH"))
eId=ocTanHyp;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("EVEN")))
+ else if (rTest.startsWith("EVEN"))
eId=ocIsEven;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ODD")))
+ else if (rTest.startsWith("ODD"))
eId=ocIsOdd;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ACOT")))
+ else if (rTest.startsWith("ACOT"))
eId=ocArcCot;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COT")))
+ else if (rTest.startsWith("COT"))
eId=ocCot;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("TRUNC")))
+ else if (rTest.startsWith("TRUNC"))
eId=ocTrunc;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("GEOMEAN")))
+ else if (rTest.startsWith("GEOMEAN"))
eId=ocGeoMean;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("HARMEAN")))
+ else if (rTest.startsWith("HARMEAN"))
eId=ocHarMean;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("CORREL")))
+ else if (rTest.startsWith("CORREL"))
eId=ocCorrel;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("MEDIAN")))
+ else if (rTest.startsWith("MEDIAN"))
eId=ocMedian;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COV")))
+ else if (rTest.startsWith("COV"))
eId=ocCovar;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("SKEWNESS")))
+ else if (rTest.startsWith("SKEWNESS"))
eId=ocSchiefe;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("CHITEST")))
+ else if (rTest.startsWith("CHITEST"))
eId=ocChiTest;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("FTEST")))
+ else if (rTest.startsWith("FTEST"))
eId=ocFTest;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("AVEDEV")))
+ else if (rTest.startsWith("AVEDEV"))
eId=ocAveDev;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("PRODUCT")))
+ else if (rTest.startsWith("PRODUCT"))
eId=ocProduct;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("PERMUT")))
+ else if (rTest.startsWith("PERMUT"))
eId=ocVariationen;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("GAMMALN")))
+ else if (rTest.startsWith("GAMMALN"))
eId=ocGammaLn;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("POISSON")))
+ else if (rTest.startsWith("POISSON"))
eId=ocPoissonDist;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("NORMAL")))
+ else if (rTest.startsWith("NORMAL"))
eId=ocNormDist;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("CRITBINOMIAL")))
+ else if (rTest.startsWith("CRITBINOMIAL"))
eId=ocKritBinom;
return eId;
}
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index c1343d9..ea99384 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -458,7 +458,7 @@ bool PDFContainer::emitSubElements( EmitContext& rWriteContext ) const
if( rWriteContext.m_bDecrypt )
{
const PDFName* pName = dynamic_cast<PDFName*>(m_aSubElements[i]);
- if (pName && pName->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("Encrypt")))
+ if (pName && pName->m_aName.startsWith("Encrypt"))
{
i++;
continue;
@@ -695,7 +695,7 @@ bool PDFObject::getDeflatedStream( char** ppStream, unsigned int* pBytes, const
}
// is the (first) filter FlateDecode ?
- if (pFilter && pFilter->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("FlateDecode")))
+ if (pFilter && pFilter->m_aName.startsWith("FlateDecode"))
{
bIsDeflated = true;
}
@@ -850,7 +850,7 @@ bool PDFObject::emit( EmitContext& rWriteContext ) const
if( it != pClone->m_pStream->m_pDict->m_aMap.end() )
{
PDFName* pFilter = dynamic_cast<PDFName*>(it->second);
- if (pFilter && pFilter->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("FlateDecode")))
+ if (pFilter && pFilter->m_aName.startsWith("FlateDecode"))
pClone->m_pStream->m_pDict->eraseValue( "Filter" );
else
{
@@ -858,7 +858,7 @@ bool PDFObject::emit( EmitContext& rWriteContext ) const
if( pArray && ! pArray->m_aSubElements.empty() )
{
pFilter = dynamic_cast<PDFName*>(pArray->m_aSubElements.front());
- if (pFilter && pFilter->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("FlateDecode")))
+ if (pFilter && pFilter->m_aName.startsWith("FlateDecode"))
{
delete pFilter;
pArray->m_aSubElements.erase( pArray->m_aSubElements.begin() );
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index 869b29f..501cd2e 100644
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -51,15 +51,15 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
{
nIndex = 0;
OString sTmp(sLine.getToken(0, ':', nIndex));
- if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("StartHTML")))
+ if (sTmp.startsWith("StartHTML"))
nStt = sLine.copy(nIndex).toInt32();
- else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("EndHTML")))
+ else if (sTmp.startsWith("EndHTML"))
nEnd = sLine.copy(nIndex).toInt32();
- else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("StartFragment")))
+ else if (sTmp.startsWith("StartFragment"))
nFragStart = sLine.copy(nIndex).toInt32();
- else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("EndFragment")))
+ else if (sTmp.startsWith("EndFragment"))
nFragEnd = sLine.copy(nIndex).toInt32();
- else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("SourceURL")))
+ else if (sTmp.startsWith("SourceURL"))
sBaseURL = OStringToOUString( sLine.copy(nIndex), RTL_TEXTENCODING_UTF8 );
if (nEnd >= 0 && nStt >= 0 &&
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 95f5639..06e2a3c 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -61,7 +61,7 @@ const MetaCommentAction* ImplCheckForEPS( GDIMetaFile& rMtf )
if ( ( rMtf.GetActionSize() >= 2 )
&& ( rMtf.FirstAction()->GetType() == META_EPS_ACTION )
&& ( ((const MetaAction*)rMtf.GetAction( 1 ))->GetType() == META_COMMENT_ACTION )
- && ( ((const MetaCommentAction*)rMtf.GetAction( 1 ))->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EPSReplacementGraphic")) ) )
+ && ( ((const MetaCommentAction*)rMtf.GetAction( 1 ))->GetComment().startsWith("EPSReplacementGraphic") ) )
pComment = (const MetaCommentAction*)rMtf.GetAction( 1 );
return pComment;
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 8e0333d..9ef44e7 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 224dab5..51247ef 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 6ca213b..ece2f6c 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;
}
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index 3526138..4b9756b 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -246,7 +246,7 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa
bPDFDevice = true;
rJobData.m_nPDFDevice = aLine.copy(RTL_CONSTASCII_LENGTH(pdfdeviceEquals)).toInt32();
}
- else if (aLine.equalsL(RTL_CONSTASCII_STRINGPARAM("PPDContexData")))
+ else if (aLine.startsWith("PPDContexData"))
{
if( bPrinter )
{
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 8a6a0a4..35bea65 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -980,17 +980,17 @@ void PPDParser::parse( ::std::list< OString >& rLines )
parseOpenUI( aCurrentLine );
continue;
}
- else if (aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("OrderDependency")))
+ else if (aKey.startsWith("OrderDependency"))
{
parseOrderDependency( aCurrentLine );
continue;
}
- else if (aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIConstraints")) ||
- aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("NonUIConstraints")))
+ else if (aKey.startsWith("UIConstraints") ||
+ aKey.startsWith("NonUIConstraints"))
{
continue; // parsed in pass 2
}
- else if( aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("CustomPageSize")) ) // currently not handled
+ else if( aKey.startsWith("CustomPageSize") ) // currently not handled
continue;
// default values are parsed in pass 2
@@ -1278,15 +1278,15 @@ void PPDParser::parseOrderDependency(const OString& rLine)
pKey = keyit->second;
pKey->m_nOrderDependency = nOrder;
- if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("ExitServer")) )
+ if( aSetup.startsWith("ExitServer") )
pKey->m_eSetupType = PPDKey::ExitServer;
- else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("Prolog")) )
+ else if( aSetup.startsWith("Prolog") )
pKey->m_eSetupType = PPDKey::Prolog;
- else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("DocumentSetup")) )
+ else if( aSetup.startsWith("DocumentSetup") )
pKey->m_eSetupType = PPDKey::DocumentSetup;
- else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("PageSetup")) )
+ else if( aSetup.startsWith("PageSetup") )
pKey->m_eSetupType = PPDKey::PageSetup;
- else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("JCLSetup")) )
+ else if( aSetup.startsWith("JCLSetup") )
pKey->m_eSetupType = PPDKey::JCLSetup;
else
pKey->m_eSetupType = PPDKey::AnySetup;
commit d894fee80e40519cb579987b95cb3d19345dfa71
Author: Noel Grandin <noel at peralex.com>
Date: Wed Nov 20 11:45:23 2013 +0200
remove RTL_CONSTASCII_STRINGPARAM in OStringBuffer constructor
Convert code like:
OStringBuffer aKeyName(RTL_CONSTASCII_STRINGPARAM("NDX"));
to:
OStringBuffer aKeyName("NDX");
which compiles down to the same code
Change-Id: If9c96a290bc18cc8285fb733f27be58c6958b63c
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index dfc9713..c9b7970 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1111,8 +1111,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
if ( rKeyEvent.GetKeyCode().IsMod1() && rKeyEvent.GetKeyCode().IsMod2() )
{
bDebugPaint = !bDebugPaint;
- OStringBuffer aInfo(RTL_CONSTASCII_STRINGPARAM(
- "DebugPaint: "));
+ OStringBuffer aInfo("DebugPaint: ");
aInfo.append(bDebugPaint ? "On" : "Off");
InfoBox(NULL, OStringToOUString(aInfo.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)).Execute();
}
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index 6da7fe5..2ee2b49 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -251,7 +251,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
static const char* pNPXPluginPath = getenv( "NPX_PLUGIN_PATH" );
// netscape!, quick, beam me back to the 90's when Motif roamed the earth
- OStringBuffer aSearchBuffer(RTL_CONSTASCII_STRINGPARAM("/usr/lib/netscape/plugins"));
+ OStringBuffer aSearchBuffer("/usr/lib/netscape/plugins");
if( pHome )
aSearchBuffer.append(':').append(pHome).append("/.netscape/plugins");
if( pNPXPluginPath )
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index a11a656..fbc0318 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -1275,8 +1275,7 @@ void SaneDlg::SaveState()
sal_Bool bValue;
if( mrSane.GetOptionValue( nOption, bValue ) )
{
- OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM(
- "BOOL="));
+ OStringBuffer aString("BOOL=");
aString.append(static_cast<sal_Int32>(bValue));
aConfig.WriteKey(aOption, aString.makeStringAndClear());
}
@@ -1287,7 +1286,7 @@ void SaneDlg::SaveState()
OString aValue;
if( mrSane.GetOptionValue( nOption, aValue ) )
{
- OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("STRING="));
+ OStringBuffer aString("STRING=");
aString.append(aValue);
aConfig.WriteKey( aOption, aString.makeStringAndClear() );
}
@@ -1296,7 +1295,7 @@ void SaneDlg::SaveState()
case SANE_TYPE_FIXED:
case SANE_TYPE_INT:
{
- OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("NUMERIC="));
+ OStringBuffer aString("NUMERIC=");
double fValue;
char buf[256];
int n;
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 03bb4aa..b78de74 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -134,7 +134,7 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
sal_uInt32 nTokPos = rInStm.Tell();
if( !rBase.ReadIdFile( OStringToOUString(aSlotIdFile.getString(), RTL_TEXTENCODING_ASCII_US)) )
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot read file: "));
+ OStringBuffer aStr("cannot read file: ");
aStr.append(aSlotIdFile.getString());
rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() );
rBase.WriteError( rInStm );
@@ -256,14 +256,14 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
}
else
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot open file: "));
+ OStringBuffer aStr("cannot open file: ");
aStr.append(OUStringToOString(aFullName, RTL_TEXTENCODING_UTF8));
rBase.SetError(aStr.makeStringAndClear(), pTok);
}
}
else
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot find file:"));
+ OStringBuffer aStr("cannot find file:");
aStr.append(OUStringToOString(aFullName, RTL_TEXTENCODING_UTF8));
rBase.SetError(aStr.makeStringAndClear(), pTok);
}
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 9201b53..4d78be8 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -1076,7 +1076,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix,
static OString MakeSlotName( SvStringHashEntry * pEntry )
{
- OStringBuffer aName(RTL_CONSTASCII_STRINGPARAM("SFX_SLOT_"));
+ OStringBuffer aName("SFX_SLOT_");
aName.append(pEntry->GetName());
return aName.makeStringAndClear().toAsciiUpperCase();
};
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index db65a4f..a35b4d7 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -160,8 +160,7 @@ sal_Int32 ReadThroughComponent(
catch (const SAXParseException& r)
{
#if OSL_DEBUG_LEVEL > 1
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "SAX parse exception caught while importing:\n"));
+ OStringBuffer aError("SAX parse exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
aError.append(r.LineNumber);
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 3c17edc..4a660c0 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -3029,8 +3029,7 @@ bool ScDPResultDimension::IsValidEntry( const vector< SCROW >& aMembers ) const
if ( NULL != pMember )
return pMember->IsValidEntry( aMembers );
#if OSL_DEBUG_LEVEL > 1
- OStringBuffer strTemp(RTL_CONSTASCII_STRINGPARAM(
- "IsValidEntry: Member not found, DimName = "));
+ OStringBuffer strTemp("IsValidEntry: Member not found, DimName = ");
strTemp.append(OUStringToOString(GetName(), RTL_TEXTENCODING_UTF8));
OSL_TRACE("%s", strTemp.getStr());
#endif
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index e977643..91399bb 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -86,7 +86,7 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtStr
bAddIn = sal_True;
if( pExtString )
{
- OStringBuffer s(RTL_CONSTASCII_STRINGPARAM("QPRO_"));
+ OStringBuffer s("QPRO_");
s.append(pExtString);
nPush = aPool.Store(eOc, OStringToOUString(s.makeStringAndClear(), maIn.GetStreamCharSet()));
aPool << nPush;
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index fb3d4b1..5b99a8c 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -208,8 +208,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCo
{
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "SAX parse exception catched while importing:\n"));
+ OStringBuffer aError("SAX parse exception catched while importing:\n");
aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
#endif
@@ -245,8 +244,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCo
{
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "SAX exception catched while importing:\n"));
+ OStringBuffer aError("SAX exception catched while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -259,8 +257,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCo
catch( const packages::zip::ZipIOException& r )
{
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "Zip exception catched while importing:\n"));
+ OStringBuffer aError("Zip exception catched while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL( aError.getStr() );
@@ -272,8 +269,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCo
catch( const io::IOException& r )
{
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "IO exception catched while importing:\n"));
+ OStringBuffer aError("IO exception catched while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -285,8 +281,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCo
catch( const uno::Exception& r )
{
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "uno exception catched while importing:\n"));
+ OStringBuffer aError("uno exception catched while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
index 58c2198..0d7bcf5 100644
--- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
+++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
@@ -74,8 +74,7 @@ void ScDrawModelBroadcaster::Notify( SfxBroadcaster&,
{
(void) r;
#if OSL_DEBUG_LEVEL > 1
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "Runtime exception caught while notifying shape.:\n"));
+ OStringBuffer aError("Runtime exception caught while notifying shape.:\n");
aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US));
OSL_FAIL( aError.getStr() );
#endif
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 2ae3ec0..acd9eeb 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -135,7 +135,7 @@ IMPL_LINK(SfxEventAsyncer_Impl, TimerHdl, Timer*, pAsyncTimer)
#ifdef DBG_UTIL
if (!xRef.Is())
{
- OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("SfxEvent: "));
+ OStringBuffer aTmp("SfxEvent: ");
aTmp.append(OUStringToOString(aHint.GetEventName(), RTL_TEXTENCODING_UTF8));
OSL_TRACE( "%s", aTmp.getStr() );
}
@@ -884,7 +884,7 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron
#ifdef DBG_UTIL
if (!pDoc)
{
- OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("SfxEvent: "));
+ OStringBuffer aTmp("SfxEvent: ");
aTmp.append(OUStringToOString(rEventHint.GetEventName(), RTL_TEXTENCODING_UTF8));
OSL_TRACE( "%s", aTmp.getStr() );
}
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 33ce8ed..edc0bc5 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -320,7 +320,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
#ifdef DBG_UTIL
else
{
- OStringBuffer aDbgStr(RTL_CONSTASCII_STRINGPARAM("Property not convertible: "));
+ OStringBuffer aDbgStr("Property not convertible: ");
aDbgStr.append(pSlot->pUnoName);
OSL_FAIL( aDbgStr.getStr() );
}
@@ -333,7 +333,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
if ( nSub >= nSubCount )
{
// there was a parameter with a name that didn't match to any of the members
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property name does not match: "));
+ OStringBuffer aStr("Property name does not match: ");
aStr.append(OUStringToOString(rPropValue.Name, RTL_TEXTENCODING_UTF8));
OSL_FAIL( aStr.getStr() );
}
@@ -364,7 +364,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
if ( !pItem )
{
#ifdef DBG_UTIL
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("No creator method for argument: "));
+ OStringBuffer aStr("No creator method for argument: ");
aStr.append(rArg.pName);
OSL_FAIL( aStr.getStr() );
#endif
@@ -460,7 +460,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
// ... but it was not convertible
bRet = sal_False;
#ifdef DBG_UTIL
- OStringBuffer aDbgStr(RTL_CONSTASCII_STRINGPARAM("Property not convertible: "));
+ OStringBuffer aDbgStr("Property not convertible: ");
aDbgStr.append(rArg.pName);
OSL_FAIL( aDbgStr.getStr() );
#endif
@@ -1003,8 +1003,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
else
{
// we will not rely on the "toggle" ability of some property slots
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "Processing property slot without argument: "));
+ OStringBuffer aStr("Processing property slot without argument: ");
aStr.append(static_cast<sal_Int32>(nSlotId));
OSL_FAIL(aStr.getStr());
}
@@ -1306,8 +1305,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
continue;
}
- OStringBuffer aDbg(RTL_CONSTASCII_STRINGPARAM(
- "Unknown item detected: "));
+ OStringBuffer aDbg("Unknown item detected: ");
aDbg.append(static_cast<sal_Int32>(nId));
DBG_ASSERT(nArg<nFormalArgs, aDbg.getStr());
}
@@ -1337,8 +1335,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
pValue[nActProp].Name = OUString::createFromAscii(pSlot->pUnoName) ;
if ( !pItem->QueryValue( pValue[nActProp].Value ) )
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "Item not convertible: "));
+ OStringBuffer aStr("Item not convertible: ");
aStr.append(static_cast<sal_Int32>(nSlotId));
OSL_FAIL(aStr.getStr());
}
@@ -1390,8 +1387,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
pValue[nActProp].Name = OUString::createFromAscii( rArg.pName ) ;
if ( !pItem->QueryValue( pValue[nActProp++].Value ) )
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "Item not convertible: "));
+ OStringBuffer aStr("Item not convertible: ");
aStr.append(static_cast<sal_Int32>(rArg.nSlotId));
OSL_FAIL(aStr.getStr());
}
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 33224c5..3640b46 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -636,7 +636,7 @@ sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const
return sal_False;
#ifdef DBG_UTIL
- OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("SfxHelp: HelpId = "));
+ OStringBuffer aTmp("SfxHelp: HelpId = ");
aTmp.append(OUStringToOString(aHelpURL, RTL_TEXTENCODING_UTF8));
OSL_TRACE( aTmp.getStr() );
#endif
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 4031505..c5ced24 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -204,8 +204,7 @@ SfxRequest::SfxRequest
#ifdef DBG_UTIL
else
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "Recording unsupported slot: "));
+ OStringBuffer aStr("Recording unsupported slot: ");
aStr.append(static_cast<sal_Int32>(pImp->pPool->GetSlotId(nSlotId)));
OSL_FAIL(aStr.getStr());
}
@@ -692,8 +691,7 @@ void SfxRequest::Done_Impl
// new Recording uses UnoName!
if ( !pImp->pSlot->pUnoName )
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "Recording not exported slot: "));
+ OStringBuffer aStr("Recording not exported slot: ");
aStr.append(static_cast<sal_Int32>(pImp->pSlot->GetSlotId()));
OSL_FAIL(aStr.getStr());
}
@@ -714,8 +712,7 @@ void SfxRequest::Done_Impl
#ifdef DBG_UTIL
if ( SFX_ITEM_SET != eState )
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "Recording property not available: "));
+ OStringBuffer aStr("Recording property not available: ");
aStr.append(static_cast<sal_Int32>(pImp->pSlot->GetSlotId()));
OSL_FAIL(aStr.getStr());
}
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 7fdde8e..146245a 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -444,7 +444,7 @@ SfxDispatchController_Impl::SfxDispatchController_Impl(
{
if ( aDispatchURL.Protocol == "slot:" && pUnoName )
{
- OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM(".uno:"));
+ OStringBuffer aTmp(".uno:");
aTmp.append(pUnoName);
aDispatchURL.Complete = OStringToOUString(aTmp.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
Reference< XURLTransformer > xTrans( URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index fe0a540..b0cf71e 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -276,8 +276,7 @@ SdrModel::~SdrModel()
#ifdef DBG_UTIL
if(pAktUndoGroup)
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "In the Dtor of the SdrModel there is an open Undo left: \""));
+ OStringBuffer aStr("In the Dtor of the SdrModel there is an open Undo left: \"");
aStr.append(OUStringToOString(pAktUndoGroup->GetComment(), osl_getThreadTextEncoding()))
.append('\"');
OSL_FAIL(aStr.getStr());
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 9a464ae..43e8672 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -734,7 +734,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
if( pCaption && !pCaption->isEmpty() )
{
rWrt.OutNewLine(); // <CAPTION> in neue Zeile
- OStringBuffer sOutStr(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_caption));
+ OStringBuffer sOutStr(OOO_STRING_SVTOOLS_HTML_caption);
sOutStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append("=\"")
.append(bTopCaption ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom)
.append("\"");
@@ -1101,7 +1101,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_center, sal_True );
else
{
- OStringBuffer sOut(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_division));
+ OStringBuffer sOut(OOO_STRING_SVTOOLS_HTML_division);
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append("=\"")
.append(OOO_STRING_SVTOOLS_HTML_AL_right).append("\"");
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.getStr(),
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 3a11d2c..d9dbc42 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -188,8 +188,7 @@ sal_Int32 ReadThroughComponent(
return ERRCODE_SFX_WRONGPASSWORD;
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "SAX parse exception caught while importing:\n"));
+ OStringBuffer aError("SAX parse exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -224,8 +223,7 @@ sal_Int32 ReadThroughComponent(
return ERRCODE_SFX_WRONGPASSWORD;
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "SAX exception caught while importing:\n"));
+ OStringBuffer aError("SAX exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -237,8 +235,7 @@ sal_Int32 ReadThroughComponent(
{
(void)r;
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "Zip exception caught while importing:\n"));
+ OStringBuffer aError("Zip exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -249,8 +246,7 @@ sal_Int32 ReadThroughComponent(
{
(void)r;
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "IO exception caught while importing:\n"));
+ OStringBuffer aError("IO exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -261,8 +257,7 @@ sal_Int32 ReadThroughComponent(
{
(void)r;
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "uno exception caught while importing:\n"));
+ OStringBuffer aError("uno exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index be33598..e9f7791 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -793,14 +793,14 @@ bool PrinterInfoManager::writePrinterConfig()
for( int i = 0; i < it->second.m_aInfo.m_aContext.countValuesModified(); i++ )
{
const PPDKey* pKey = it->second.m_aInfo.m_aContext.getModifiedKey( i );
- OStringBuffer aKey(RTL_CONSTASCII_STRINGPARAM("PPD_"));
+ OStringBuffer aKey("PPD_");
aKey.append(OUStringToOString(pKey->getKey(), RTL_TEXTENCODING_ISO_8859_1));
const PPDValue* pValue = it->second.m_aInfo.m_aContext.getValue( pKey );
if (pValue)
aValue.append(OUStringToOString(pValue->m_aOption, RTL_TEXTENCODING_ISO_8859_1));
else
- aValue.append(RTL_CONSTASCII_STRINGPARAM("*nil"));
+ aValue.append("*nil");
pConfig->WriteKey(aKey.makeStringAndClear(), aValue.makeStringAndClear());
}
}
@@ -810,7 +810,7 @@ bool PrinterInfoManager::writePrinterConfig()
for( ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator subst = it->second.m_aInfo.m_aFontSubstitutes.begin();
subst != it->second.m_aInfo.m_aFontSubstitutes.end(); ++subst )
{
- OStringBuffer aKey(RTL_CONSTASCII_STRINGPARAM("SubstFont_"));
+ OStringBuffer aKey("SubstFont_");
aKey.append(OUStringToOString(subst->first, RTL_TEXTENCODING_ISO_8859_1));
pConfig->WriteKey( aKey.makeStringAndClear(), OUStringToOString( subst->second, RTL_TEXTENCODING_ISO_8859_1 ) );
}
commit 5112f6a6c6e4cd76045f31e269a679b50dc83fb2
Author: Noel Grandin <noel at peralex.com>
Date: Wed Nov 20 11:10:15 2013 +0200
remove RTL_CONSTASCII_STRINGPARAM in OString constructor
Convert code like:
OString aKeyName(RTL_CONSTASCII_STRINGPARAM("NDX"));
to:
OString aKeyName("NDX");
which compiles down to the same code
Change-Id: I1780264cae4484fc78f0586b0750c09f2dce135f
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 2b979b0..f6f9295 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -532,7 +532,7 @@ void tokenizeSQL( const OString & sql, OStringVector &vec )
{
if( i - start )
vec.push_back( OString( &sql.getStr()[start], i - start ) );
- vec.push_back( OString( RTL_CONSTASCII_STRINGPARAM( "." ) ) );
+ vec.push_back( OString( "." ) );
start = i + 1;
}
}
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 37b4e95..644df94 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
using namespace ::svt;
-const OString aGroupIdent(RTL_CONSTASCII_STRINGPARAM("dBase III"));
+const OString aGroupIdent("dBase III");
DBG_NAME(ODbaseIndexDialog)
@@ -472,7 +472,7 @@ void OTableInfo::WriteInfFile( const OUString& rDSN ) const
++aIndex, ++nPos
)
{
- OStringBuffer aKeyName(RTL_CONSTASCII_STRINGPARAM("NDX"));
+ OStringBuffer aKeyName("NDX");
if( nPos > 0 ) // first index contains no number
aKeyName.append(static_cast<sal_Int32>(nPos));
aInfFile.WriteKey(
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 6858066..f6aad73 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -992,9 +992,9 @@ namespace drawinglayer
// support for FIELD_SEQ_BEGIN, FIELD_SEQ_END and URL. It wraps text primitives (but is not limited to)
// thus do the MetafileAction embedding stuff but just handle recursively.
const primitive2d::TextHierarchyFieldPrimitive2D& rFieldPrimitive = static_cast< const primitive2d::TextHierarchyFieldPrimitive2D& >(rCandidate);
- const OString aCommentStringCommon(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN"));
- const OString aCommentStringPage(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN;PageField"));
- const OString aCommentStringEnd(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_END"));
+ const OString aCommentStringCommon("FIELD_SEQ_BEGIN");
+ const OString aCommentStringPage("FIELD_SEQ_BEGIN;PageField");
+ const OString aCommentStringEnd("FIELD_SEQ_END");
switch(rFieldPrimitive.getType())
{
@@ -1043,7 +1043,7 @@ namespace drawinglayer
case PRIMITIVE2D_ID_TEXTHIERARCHYLINEPRIMITIVE2D :
{
const primitive2d::TextHierarchyLinePrimitive2D& rLinePrimitive = static_cast< const primitive2d::TextHierarchyLinePrimitive2D& >(rCandidate);
- const OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOL"));
+ const OString aCommentString("XTEXT_EOL");
// process recursively and add MetaFile comment
process(rLinePrimitive.get2DDecomposition(getViewInformation2D()));
@@ -1056,7 +1056,7 @@ namespace drawinglayer
// in Outliner::PaintBullet(), a MetafileComment for bullets is added, too. The
// "XTEXT_EOC" is used, use here, too.
const primitive2d::TextHierarchyBulletPrimitive2D& rBulletPrimitive = static_cast< const primitive2d::TextHierarchyBulletPrimitive2D& >(rCandidate);
- const OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC"));
+ const OString aCommentString("XTEXT_EOC");
// process recursively and add MetaFile comment
process(rBulletPrimitive.get2DDecomposition(getViewInformation2D()));
@@ -1067,7 +1067,7 @@ namespace drawinglayer
case PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D :
{
const primitive2d::TextHierarchyParagraphPrimitive2D& rParagraphPrimitive = static_cast< const primitive2d::TextHierarchyParagraphPrimitive2D& >(rCandidate);
- const OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOP"));
+ const OString aCommentString("XTEXT_EOP");
if(mpPDFExtOutDevData)
{
@@ -1090,8 +1090,8 @@ namespace drawinglayer
case PRIMITIVE2D_ID_TEXTHIERARCHYBLOCKPRIMITIVE2D :
{
const primitive2d::TextHierarchyBlockPrimitive2D& rBlockPrimitive = static_cast< const primitive2d::TextHierarchyBlockPrimitive2D& >(rCandidate);
- const OString aCommentStringA(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_BEGIN"));
- const OString aCommentStringB(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_END"));
+ const OString aCommentStringA("XTEXT_PAINTSHAPE_BEGIN");
+ const OString aCommentStringB("XTEXT_PAINTSHAPE_END");
// add MetaFile comment, process recursively and add MetaFile comment
mpMetaFile->AddAction(new MetaCommentAction(aCommentStringA));
@@ -1138,9 +1138,9 @@ namespace drawinglayer
sal_Int32 nNextCellBreak(mxBreakIterator->nextCharacters(rTxt, nTextPosition, rLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 0, nDone));
::com::sun::star::i18n::Boundary nNextWordBoundary(mxBreakIterator->getWordBoundary(rTxt, nTextPosition, rLocale, ::com::sun::star::i18n::WordType::ANY_WORD, sal_True));
sal_Int32 nNextSentenceBreak(mxBreakIterator->endOfSentence(rTxt, nTextPosition, rLocale));
- const OString aCommentStringA(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC"));
- const OString aCommentStringB(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOW"));
- const OString aCommentStringC(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOS"));
+ const OString aCommentStringA("XTEXT_EOC");
+ const OString aCommentStringB("XTEXT_EOW");
+ const OString aCommentStringC("XTEXT_EOS");
for(sal_Int32 i(nTextPosition); i < nTextPosition + nTextLength; i++)
{
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
index 4809cf4..94beb83 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -299,7 +299,7 @@ bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal
// Only report errors when not stopped
else
{
- OString aMessage(RTL_CONSTASCII_STRINGPARAM("Unknown error"));
+ OString aMessage("Unknown error");
const char * error_message = curl_easy_strerror(cc);
if( NULL != error_message )
@@ -311,9 +311,9 @@ bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal
curl_easy_getinfo( pCURL, CURLINFO_RESPONSE_CODE, &nError );
if ( 403 == nError )
- aMessage += OString( RTL_CONSTASCII_STRINGPARAM( " 403: Access denied!" ) );
+ aMessage += OString( " 403: Access denied!" );
else if ( 404 == nError )
- aMessage += OString( RTL_CONSTASCII_STRINGPARAM( " 404: File not found!" ) );
+ aMessage += OString( " 404: File not found!" );
else if ( 416 == nError )
{
// we got this error probably, because we already downloaded the file
@@ -322,9 +322,9 @@ bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal
}
else
{
- aMessage += OString( RTL_CONSTASCII_STRINGPARAM( ":error code = " ) );
+ aMessage += OString( ":error code = " );
aMessage += OString::number( nError );
- aMessage += OString( RTL_CONSTASCII_STRINGPARAM( " !" ) );
+ aMessage += OString( " !" );
}
}
if ( !ret )
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index c927bf5..fdb2e56 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -278,7 +278,7 @@ static void createSlideFile( Reference< XComponent > xDoc, PlacewareZipFile& rZi
}
}
- if( (osl::File::E_None != nRC) || !rZipFile.addFile( aInfoFile, OString( RTL_CONSTASCII_STRINGPARAM("slides.txt") ) ))
+ if( (osl::File::E_None != nRC) || !rZipFile.addFile( aInfoFile, OString( "slides.txt" ) ))
throw IOException();
}
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 3e131ee..23793a6 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -85,8 +85,8 @@ SvToken & SvToken::operator = ( const SvToken & rObj )
void SvTokenStream::InitCtor()
{
- aStrTrue = OString(RTL_CONSTASCII_STRINGPARAM("TRUE"));
- aStrFalse = OString(RTL_CONSTASCII_STRINGPARAM("FALSE"));
+ aStrTrue = OString("TRUE");
+ aStrFalse = OString("FALSE");
nLine = nColumn = 0;
nBufPos = 0;
nTabSize = 4;
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 63f4a8f..fc3e594 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -358,7 +358,7 @@ void CfgExport::WorkOnResourceEnd()
if ( bLocalize ) {
if ( !pStackData->sText["en-US"].isEmpty() )
{
- OString sXComment = pStackData->sText[OString(RTL_CONSTASCII_STRINGPARAM("x-comment"))];
+ OString sXComment = pStackData->sText[OString("x-comment")];
OString sLocalId = pStackData->sIdentifier;
OString sGroupId;
if ( aStack.size() == 1 ) {
diff --git a/rsc/source/res/rscall.cxx b/rsc/source/res/rscall.cxx
index a3d0df5..d2dbfb0 100644
--- a/rsc/source/res/rscall.cxx
+++ b/rsc/source/res/rscall.cxx
@@ -36,17 +36,13 @@ Atom nRsc_EXTRADATA = InvalidAtom;
void InitRscCompiler()
{
- pStdParType = new OString(RTL_CONSTASCII_STRINGPARAM(
- "( const ResId & rResId, sal_Bool"));
+ pStdParType = new OString("( const ResId & rResId, sal_Bool");
pStdPar1 = new OString('(');
pStdPar2 = new OString('(');
- pWinParType = new OString(RTL_CONSTASCII_STRINGPARAM(
- "( Window * pParent, const ResId & rResId, sal_Bool"));
- pWinPar1 = new OString(RTL_CONSTASCII_STRINGPARAM(
- "( pParent,"));
- pWinPar2 = new OString(RTL_CONSTASCII_STRINGPARAM(
- "( this,"));
+ pWinParType = new OString("( Window * pParent, const ResId & rResId, sal_Bool");
+ pWinPar1 = new OString("( pParent,");
+ pWinPar2 = new OString("( this,");
nRefDeep = 10;
nRsc_XYMAPMODEId = InvalidAtom;
nRsc_WHMAPMODEId = InvalidAtom;
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 50268ff..43f255c 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -444,7 +444,7 @@ inline void deleteTestDirectory( const ::rtl::OUString dirname )
nError = ::osl::Directory::remove( aPathURL );
- rtl::OString strError (RTL_CONSTASCII_STRINGPARAM("In deleteTestDirectory function: remove Directory "));
+ rtl::OString strError ("In deleteTestDirectory function: remove Directory ");
strError += ::rtl::OUStringToOString( aPathURL, RTL_TEXTENCODING_ASCII_US );
CPPUNIT_ASSERT_MESSAGE( strError.getStr(), ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_NOENT ) );
}
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index f09c114..c230710 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -54,7 +54,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
OString t;
if( pExtString )
{
- const OString s(RTL_CONSTASCII_STRINGPARAM("@<<@123>>"));
+ const OString s("@<<@123>>");
t = pExtString;
@@ -67,7 +67,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
eOc = lcl_KnownAddIn( t );
if( eOc == ocNoName )
- t = OString(RTL_CONSTASCII_STRINGPARAM("L123_")) + t;
+ t = OString("L123_") + t;
}
else
t = "#UNKNOWN FUNC NAME#";
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index a053055..0cb1b07 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -79,9 +79,7 @@ namespace slideshow
MetaCommentAction* pAct = static_cast<MetaCommentAction*>(pCurrAct);
// skip comment if not a special XTEXT... comment
- if( pAct->GetComment().matchIgnoreAsciiCase(
- OString(RTL_CONSTASCII_STRINGPARAM("XTEXT")),
- 0) )
+ if( pAct->GetComment().matchIgnoreAsciiCase( OString("XTEXT"), 0 ) )
{
// fill classification vector with NOOPs,
// then insert corresponding classes at
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index 9850f3e3..4845489 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -450,9 +450,7 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect,
MetaCommentAction * pAct =
static_cast<MetaCommentAction *>(pCurrAct);
// skip comment if not a special XTEXT... comment
- if( pAct->GetComment().matchIgnoreAsciiCase(
- OString(RTL_CONSTASCII_STRINGPARAM("XTEXT")),
- 0) )
+ if( pAct->GetComment().matchIgnoreAsciiCase( OString("XTEXT"), 0 ) )
{
if (pAct->GetComment().equalsIgnoreAsciiCaseL(
RTL_CONSTASCII_STRINGPARAM("XTEXT_SCROLLRECT") ))
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 1b5df88..8757ca0 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -364,7 +364,7 @@ void NameTranslationList::Init()
OUString aFsysName( maTransFile.getFSysPath( INetURLObject::FSYS_DETECT ) );
Config aConfig( aFsysName );
- aConfig.SetGroup( OString(RTL_CONSTASCII_STRINGPARAM("TRANSLATIONNAMES")) );
+ aConfig.SetGroup( OString("TRANSLATIONNAMES") );
sal_uInt16 nKeyCnt = aConfig.GetKeyCount();
More information about the Libreoffice-commits
mailing list