[Libreoffice-commits] .: animations/source basctl/source basic/source comphelper/source connectivity/source cui/source dbaccess/source extensions/source filter/source forms/source fpicker/source
Takeshi Abe
tabe at kemper.freedesktop.org
Sat Feb 18 06:21:37 PST 2012
animations/source/animcore/targetpropertiescreator.cxx | 12 +++++-----
basctl/source/basicide/scriptdocument.cxx | 4 +--
basic/source/sbx/sbxscan.cxx | 4 +--
comphelper/source/misc/mediadescriptor.cxx | 4 +--
connectivity/source/drivers/ado/ACatalog.cxx | 3 +-
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 2 -
connectivity/source/drivers/postgresql/pq_xcolumns.cxx | 6 ++---
cui/source/options/optgdlg.cxx | 4 +--
dbaccess/source/ui/misc/WCopyTable.cxx | 2 -
extensions/source/update/check/updateprotocol.cxx | 2 -
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 4 +--
forms/source/component/Filter.cxx | 6 ++---
forms/source/xforms/submission.cxx | 8 +++---
forms/source/xforms/submission/replace.cxx | 7 +++--
forms/source/xforms/xpathlib/xpathlib.cxx | 10 +++++---
fpicker/source/generic/fpicker.cxx | 10 ++++----
fpicker/source/unx/kde_unx/UnxCommandThread.cxx | 2 -
17 files changed, 47 insertions(+), 43 deletions(-)
New commits:
commit 03591233c18c90158b3567f24fa332cd7c52a7ee
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Feb 18 23:18:57 2012 +0900
Prefer equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("..."))
to equalsIgnoreAsciiCaseAscii("...")
diff --git a/animations/source/animcore/targetpropertiescreator.cxx b/animations/source/animcore/targetpropertiescreator.cxx
index fb953ee..0f04167 100644
--- a/animations/source/animcore/targetpropertiescreator.cxx
+++ b/animations/source/animcore/targetpropertiescreator.cxx
@@ -341,7 +341,7 @@ namespace animcore
// initially. This is currently the only place
// where a shape effect influences shape
// attributes outside it's effective duration.
- if( xAnimateNode->getAttributeName().equalsIgnoreAsciiCaseAscii("visibility") )
+ if( xAnimateNode->getAttributeName().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("visibility")) )
{
sal_Bool bVisible( sal_False );
@@ -356,13 +356,13 @@ namespace animcore
{
// we also take the strings "true" and "false",
// as well as "on" and "off" here
- if( aString.equalsIgnoreAsciiCaseAscii("true") ||
- aString.equalsIgnoreAsciiCaseAscii("on") )
+ if( aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ||
+ aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("on")) )
{
bVisible = sal_True;
}
- if( aString.equalsIgnoreAsciiCaseAscii("false") ||
- aString.equalsIgnoreAsciiCaseAscii("off") )
+ if( aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("false")) ||
+ aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("off")) )
{
bVisible = sal_False;
}
@@ -477,7 +477,7 @@ namespace animcore
sal_Bool SAL_CALL TargetPropertiesCreator::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
{
- return ServiceName.equalsIgnoreAsciiCaseAscii( SERVICE_NAME );
+ return ServiceName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(SERVICE_NAME));
}
uno::Sequence< ::rtl::OUString > SAL_CALL TargetPropertiesCreator::getSupportedServiceNames() throw( uno::RuntimeException )
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index bc850bc..97124f2 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -952,11 +952,11 @@ namespace basctl
Reference< XUriReference > xUriRef( xUriFac->parse( aLinkURL ), UNO_QUERY_THROW );
::rtl::OUString aScheme = xUriRef->getScheme();
- if ( aScheme.equalsIgnoreAsciiCaseAscii( "file" ) )
+ if ( aScheme.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("file")) )
{
aFileURL = aLinkURL;
}
- else if ( aScheme.equalsIgnoreAsciiCaseAscii( "vnd.sun.star.pkg" ) )
+ else if ( aScheme.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.pkg")) )
{
::rtl::OUString aAuthority = xUriRef->getAuthority();
if ( aAuthority.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "vnd.sun.star.expand:" ) ) )
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 50e4e6c..d938763 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -445,13 +445,13 @@ sal_Bool ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType )
// check as string in case of sal_Bool sal_True and sal_False
case SbxBOOL:
{
- if( rSrc.equalsIgnoreAsciiCaseAscii( "true" ) )
+ if( rSrc.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) )
{
aNewString = ::rtl::OUString::valueOf( (sal_Int32)SbxTRUE );
bChanged = sal_True;
}
else
- if( rSrc.equalsIgnoreAsciiCaseAscii( "false" ) )
+ if( rSrc.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("false")) )
{
aNewString = ::rtl::OUString::valueOf( (sal_Int32)SbxFALSE );
bChanged = sal_True;
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index d86bb08..544d4e5 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -657,7 +657,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const ::rtl::OUString& sURL, s
// Only file system content provider is able to provide XStream
// so for this content impossibility to create XStream triggers
// switch to readonly mode in case of opening with locking on
- if( bLockFile && aScheme.equalsIgnoreAsciiCaseAscii( "file" ) )
+ if( bLockFile && aScheme.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("file")) )
bReadOnly = sal_True;
else
{
@@ -680,7 +680,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const ::rtl::OUString& sURL, s
try
{
// all the contents except file-URLs should be opened as usual
- if ( bLockFile || !aScheme.equalsIgnoreAsciiCaseAscii( "file" ) )
+ if ( bLockFile || !aScheme.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("file")) )
xInputStream = aContent.openStream();
else
xInputStream = aContent.openStreamNoLock();
diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx
index 231c753..e2f46a7 100644
--- a/connectivity/source/drivers/ado/ACatalog.cxx
+++ b/connectivity/source/drivers/ado/ACatalog.cxx
@@ -69,7 +69,8 @@ void OCatalog::refreshTables()
if ( aElement.IsValid() )
{
::rtl::OUString sTypeName = aElement.get_Type();
- if ( !sTypeName.equalsIgnoreAsciiCaseAscii("SYSTEM TABLE") && !sTypeName.equalsIgnoreAsciiCaseAscii("ACCESS TABLE") )
+ if ( !sTypeName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("SYSTEM TABLE"))
+ && !sTypeName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("ACCESS TABLE")) )
aVector.push_back(aElement.get_Name());
}
}
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 4cb7952..3748098 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -2317,7 +2317,7 @@ static void pgTypeInfo2ResultSet(
if( dataType == com::sun::star::sdbc::DataType::CHAR ||
( dataType == com::sun::star::sdbc::DataType::VARCHAR &&
- xRow->getString(TYPE_NAME+1).equalsIgnoreAsciiCaseAscii( "varchar") ) )
+ xRow->getString(TYPE_NAME+1).equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("varchar")) ) )
{
// reflect varchar as varchar with upper limit !
//NOTE: the sql spec requires varchar to have an upper limit, however
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index 18f2965..7d34de2 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -107,14 +107,14 @@ namespace pq_sdbc_driver
static Any isCurrency( const rtl::OUString & typeName )
{
- sal_Bool b = typeName.equalsIgnoreAsciiCaseAscii( "money" );
+ sal_Bool b = typeName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("money"));
return Any( &b, getBooleanCppuType() );
}
// static sal_Bool isAutoIncrement8( const rtl::OUString & typeName )
// {
-// return typeName.equalsIgnoreAsciiCaseAscii( "serial8" ) ||
-// typeName.equalsIgnoreAsciiCaseAscii( "bigserial" );
+// return typeName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("serial8")) ||
+// typeName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("bigserial"));
// }
static Any isAutoIncrement( const rtl::OUString & defaultValue )
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index fc1b0ad..d3b9255 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -128,7 +128,7 @@ namespace
{
const ::rtl::OUString &rDesktopEnvironment = Application::GetDesktopEnvironment();
- if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) )
+ if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")) )
{
#ifdef ENABLE_KDE4
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDE4FilePicker") );
@@ -136,7 +136,7 @@ namespace
return rtl::OUString();
#endif
}
- else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
+ else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")) )
{
#ifdef ENABLE_KDE
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDEFilePicker") );
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index c1d943c..f5eea90 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -1430,7 +1430,7 @@ bool OCopyTableWizard::supportsViews( const Reference< XConnection >& _rxConnect
while ( xRs->next() )
{
::rtl::OUString sValue = xRow->getString( 1 );
- if ( !xRow->wasNull() && sValue.equalsIgnoreAsciiCaseAscii( "View" ) )
+ if ( !xRow->wasNull() && sValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("View")) )
{
bSupportsViews = true;
break;
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index ee3940a..63ca5b6 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -190,7 +190,7 @@ checkForUpdates(
{
uno::Reference< xml::dom::XElement > xParent(xNode2->getParentNode(), uno::UNO_QUERY_THROW);
rtl::OUString aType = xParent->getAttribute(UNISTRING("type"));
- bool bIsDirect = ( sal_False == aType.equalsIgnoreAsciiCaseAscii("text/html") );
+ bool bIsDirect = ( sal_False == aType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("text/html")) );
o_rUpdateInfo.Sources.push_back( DownloadSource(bIsDirect, xNode2->getNodeValue()) );
}
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 3e3abb0..8a69144 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -261,13 +261,13 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
// pretty printing is confusing for some filters so it is disabled by default
sal_Bool bPrettyPrint =
- (msUserData.getLength() > 6 && msUserData[6].equalsIgnoreAsciiCaseAscii("true"));
+ (msUserData.getLength() > 6 && msUserData[6].equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")));
// export of <text:number> element for <text:list-item> elements are
// needed for certain filters.
sal_Bool bExportTextNumberElementForListItems =
( msUserData.getLength() > 7 &&
- msUserData[7].equalsIgnoreAsciiCaseAscii("true") );
+ msUserData[7].equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) );
// get the base URI, so we can use relative links
OUString aBaseURI;
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 900e5c8..4890df7 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -589,14 +589,14 @@ namespace frm
{
Any aValue;
if ( aText.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "1" ) )
- || aText.equalsIgnoreAsciiCaseAscii( "TRUE" )
- || aText.equalsIgnoreAsciiCaseAscii( "IS TRUE" )
+ || aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("TRUE"))
+ || aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("IS TRUE"))
)
{
aValue <<= (sal_Int32)STATE_CHECK;
}
else if ( aText.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "0" ) )
- || aText.equalsIgnoreAsciiCaseAscii( "FALSE" )
+ || aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("FALSE"))
)
{
aValue <<= (sal_Int32)STATE_NOCHECK;
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index 8c58b85..f834171 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -319,17 +319,17 @@ bool Submission::doSubmit( const Reference< XInteractionHandler >& xHandler )
// strip whitespace-only text node for get submission
Reference< XDocumentFragment > aFragment = createSubmissionDocument(
- xResult, aMethod.equalsIgnoreAsciiCaseAscii("get"));
+ xResult, aMethod.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("get")));
// submit result; set encoding, etc.
auto_ptr<CSubmission> xSubmission;
- if (aMethod.equalsIgnoreAsciiCaseAscii("PUT"))
+ if (aMethod.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("PUT")))
xSubmission = auto_ptr<CSubmission>(
new CSubmissionPut( getAction(), aFragment));
- else if (aMethod.equalsIgnoreAsciiCaseAscii("post"))
+ else if (aMethod.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("post")))
xSubmission = auto_ptr<CSubmission>(
new CSubmissionPost( getAction(), aFragment));
- else if (aMethod.equalsIgnoreAsciiCaseAscii("get"))
+ else if (aMethod.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("get")))
xSubmission = auto_ptr<CSubmission>(
new CSubmissionGet( getAction(), aFragment));
else
diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx
index 015a5ea..456bce5 100644
--- a/forms/source/xforms/submission/replace.cxx
+++ b/forms/source/xforms/submission/replace.cxx
@@ -58,7 +58,8 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
try {
Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
- if (aReplace.equalsIgnoreAsciiCaseAscii("all") || aReplace.equalsIgnoreAsciiCaseAscii("document")) {
+ if (aReplace.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("all"))
+ || aReplace.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("document"))) {
Reference< XComponentLoader > xLoader;
if (aFrame.is())
xLoader = Reference< XComponentLoader >(aFrame, UNO_QUERY);
@@ -81,7 +82,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
return CSubmission::SUCCESS;
- } else if (aReplace.equalsIgnoreAsciiCaseAscii("instance")) {
+ } else if (aReplace.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("instance"))) {
if (aDocument.is()) {
// parse the result stream into a new document
Reference< XDocumentBuilder > xBuilder(xFactory->createInstance(
@@ -103,7 +104,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
// nothing to replace
return CSubmission::UNKNOWN_ERROR;
}
- } else if (aReplace.equalsIgnoreAsciiCaseAscii("none")) {
+ } else if (aReplace.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("none"))) {
// do nothing \o/
return CSubmission::SUCCESS;
}
diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx
index 71759df..8fb3fed 100644
--- a/forms/source/xforms/xpathlib/xpathlib.cxx
+++ b/forms/source/xforms/xpathlib/xpathlib.cxx
@@ -102,9 +102,11 @@ void xforms_booleanFromStringFunction(xmlXPathParserContextPtr ctxt, int nargs)
xmlChar *pString = xmlXPathPopString(ctxt);
if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE);
::rtl::OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8);
- if (aString.equalsIgnoreAsciiCaseAscii("true") || aString.equalsIgnoreAsciiCaseAscii("1"))
+ if (aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ||
+ aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("1")))
xmlXPathReturnTrue(ctxt);
- else if (aString.equalsIgnoreAsciiCaseAscii("false") || aString.equalsIgnoreAsciiCaseAscii("0"))
+ else if (aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("false")) ||
+ aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("0")))
xmlXPathReturnFalse(ctxt);
else
XP_ERROR(XPATH_NUMBER_ERROR);
@@ -232,9 +234,9 @@ void xforms_propertyFunction(xmlXPathParserContextPtr ctxt, int nargs)
xmlChar* pString = xmlXPathPopString(ctxt);
if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE);
::rtl::OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8);
- if (aString.equalsIgnoreAsciiCaseAscii("version"))
+ if (aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("version")))
xmlXPathReturnString(ctxt, (xmlChar*)_version);
- else if (aString.equalsIgnoreAsciiCaseAscii("conformance-level"))
+ else if (aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("conformance-level")))
xmlXPathReturnString(ctxt, (xmlChar*)_conformance);
else
xmlXPathReturnEmptyString(ctxt);
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 251b95a..a21cc88 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -57,11 +57,11 @@ static OUString FilePicker_getSystemPickerServiceName()
{
#ifdef UNX
OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
- if (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("kde"))
+ if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFilePicker"));
- else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("kde4"))
+ else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDE4FilePicker"));
- else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("macosx"))
+ else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("macosx")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.AquaFilePicker"));
else
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.SystemFilePicker"));
@@ -138,9 +138,9 @@ static OUString FolderPicker_getSystemPickerServiceName()
{
OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
#ifdef UNX
- if (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("kde"))
+ if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFolderPicker"));
- else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("macosx"))
+ else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("macosx")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.AquaFolderPicker"));
#endif
#ifdef WNT
diff --git a/fpicker/source/unx/kde_unx/UnxCommandThread.cxx b/fpicker/source/unx/kde_unx/UnxCommandThread.cxx
index 3b11334..d929be3 100644
--- a/fpicker/source/unx/kde_unx/UnxCommandThread.cxx
+++ b/fpicker/source/unx/kde_unx/UnxCommandThread.cxx
@@ -219,7 +219,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
if ( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "bool" ) ) )
{
- sal_Bool bValue = !aList.empty() && aList.front().equalsIgnoreAsciiCaseAscii( "true" );
+ sal_Bool bValue = !aList.empty() && aList.front().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true"));
m_aGetValue <<= bValue;
m_aGetValueCondition.set();
More information about the Libreoffice-commits
mailing list