[Libreoffice-commits] .: basic/source connectivity/source desktop/source embeddedobj/source embeddedobj/test fpicker/source framework/source scripting/source sfx2/inc sfx2/source sfx2/workben svx/source ucb/source vbahelper/source xmloff/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Thu Jan 20 02:26:23 PST 2011
basic/source/uno/namecont.cxx | 4
connectivity/source/commontools/dbtools2.cxx | 4
connectivity/source/drivers/adabas/BColumns.cxx | 2
connectivity/source/drivers/adabas/BUser.cxx | 2
connectivity/source/drivers/evoab2/NConnection.cxx | 4
connectivity/source/drivers/evoab2/NDriver.cxx | 2
connectivity/source/drivers/hsqldb/HConnection.cxx | 2
connectivity/source/drivers/hsqldb/HDriver.cxx | 4
connectivity/source/drivers/mozab/MConnection.cxx | 2
connectivity/source/drivers/mysql/YDriver.cxx | 2
desktop/source/app/app.cxx | 2
desktop/source/app/appinit.cxx | 2
desktop/source/app/officeipcthread.cxx | 2
desktop/source/migration/migration.cxx | 2
desktop/source/migration/services/autocorrmigration.cxx | 2
desktop/source/migration/services/basicmigration.cxx | 2
desktop/source/migration/services/jvmfwk.cxx | 10 -
desktop/source/migration/services/oo3extensionmigration.cxx | 4
desktop/source/migration/services/wordbookmigration.cxx | 2
desktop/source/so_comp/evaluation.cxx | 4
desktop/source/so_comp/oemjob.cxx | 6 -
embeddedobj/source/commonembedding/miscobj.cxx | 18 +--
embeddedobj/source/commonembedding/persistence.cxx | 66 ++++++------
embeddedobj/source/commonembedding/xfactory.cxx | 4
embeddedobj/source/general/docholder.cxx | 16 +-
embeddedobj/source/general/intercept.cxx | 2
embeddedobj/source/general/xcreator.cxx | 2
embeddedobj/source/msole/olecomponent.cxx | 2
embeddedobj/source/msole/oleembed.cxx | 2
embeddedobj/source/msole/olepersist.cxx | 12 +-
embeddedobj/source/msole/ownview.cxx | 6 -
embeddedobj/source/msole/xolefactory.cxx | 2
embeddedobj/test/MainThreadExecutor/xexecutor.cxx | 2
embeddedobj/test/mtexecutor/mainthreadexecutor.cxx | 2
fpicker/source/office/OfficeFilePicker.cxx | 6 -
fpicker/source/office/commonpicker.cxx | 2
fpicker/source/office/iodlg.cxx | 2
fpicker/source/unx/kde_unx/UnxCommandThread.cxx | 22 ++--
fpicker/source/unx/kde_unx/UnxFilePicker.cxx | 4
framework/source/accelerators/keymapping.cxx | 2
framework/source/classes/fwktabwindow.cxx | 12 +-
framework/source/dispatch/closedispatcher.cxx | 2
framework/source/helper/uielementwrapperbase.cxx | 4
framework/source/services/sessionlistener.cxx | 10 -
framework/source/uielement/addonstoolbarwrapper.cxx | 2
framework/source/uielement/buttontoolbarcontroller.cxx | 6 -
framework/source/uielement/constitemcontainer.cxx | 4
framework/source/uielement/fontsizemenucontroller.cxx | 2
framework/source/uielement/itemcontainer.cxx | 4
framework/source/uielement/langselectionmenucontroller.cxx | 6 -
framework/source/uielement/newmenucontroller.cxx | 4
framework/source/uielement/rootitemcontainer.cxx | 4
framework/source/uielement/toolbarsmenucontroller.cxx | 20 +--
framework/source/uifactory/addonstoolboxfactory.cxx | 6 -
framework/source/uifactory/windowcontentfactorymanager.cxx | 4
scripting/source/stringresource/stringresource.cxx | 4
sfx2/inc/sfx2/XmlIdRegistry.hxx | 4
sfx2/source/appl/appserv.cxx | 2
sfx2/source/control/unoctitm.cxx | 4
sfx2/source/dialog/dockwin.cxx | 2
sfx2/source/dialog/filedlghelper.cxx | 2
sfx2/source/dialog/recfloat.cxx | 2
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/doc/DocumentMetadataAccess.cxx | 4
sfx2/source/doc/SfxDocumentMetaData.cxx | 16 +-
sfx2/source/doc/docfac.cxx | 2
sfx2/source/doc/doctemplates.cxx | 2
sfx2/source/doc/graphhelp.cxx | 10 -
sfx2/source/doc/guisaveas.cxx | 16 +-
sfx2/source/doc/objstor.cxx | 6 -
sfx2/source/doc/plugin.cxx | 12 +-
sfx2/source/doc/sfxmodelfactory.cxx | 6 -
sfx2/source/toolbox/tbxitem.cxx | 2
sfx2/source/view/ipclient.cxx | 2
sfx2/source/view/viewfrm.cxx | 2
sfx2/source/view/viewfrm2.cxx | 2
sfx2/source/view/viewprn.cxx | 10 -
sfx2/source/view/viewsh.cxx | 18 +--
sfx2/workben/custompanel/ctp_factory.cxx | 2
svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 4
svx/source/dialog/srchdlg.cxx | 8 -
svx/source/form/fmcontrollayout.cxx | 4
svx/source/form/fmdpage.cxx | 4
svx/source/form/fmscriptingenv.cxx | 2
svx/source/form/formcontrolfactory.cxx | 2
svx/source/form/formcontroller.cxx | 6 -
svx/source/gengal/gengal.cxx | 12 +-
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 4
svx/source/svdraw/svdoashp.cxx | 2
svx/source/svdraw/svdoole2.cxx | 2
svx/source/tbxctrls/grafctrl.cxx | 22 ++--
svx/source/tbxctrls/lboxctrl.cxx | 2
svx/source/tbxctrls/tbunocontroller.cxx | 4
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 12 +-
svx/source/unodraw/unoshap2.cxx | 18 +--
svx/source/unogallery/unogalthemeprovider.cxx | 2
ucb/source/ucp/ftp/ftpcontent.cxx | 2
ucb/source/ucp/ftp/ftpurl.cxx | 26 ++--
ucb/source/ucp/ftp/test_ftpurl.cxx | 8 -
vbahelper/source/vbahelper/vbacommandbar.cxx | 4
vbahelper/source/vbahelper/vbacommandbars.cxx | 4
vbahelper/source/vbahelper/vbadialogbase.cxx | 2
xmloff/source/chart/SchXMLChartContext.cxx | 6 -
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 10 -
xmloff/source/chart/SchXMLTools.cxx | 26 ++--
xmloff/source/core/RDFaImportHelper.cxx | 2
xmloff/source/core/xmlexp.cxx | 2
xmloff/source/core/xmlimp.cxx | 2
xmloff/source/core/xmluconv.cxx | 12 +-
xmloff/source/draw/animationimport.cxx | 2
xmloff/source/forms/elementimport.cxx | 2
111 files changed, 342 insertions(+), 342 deletions(-)
New commits:
commit 898c3aa0f57dfdad973b1c9fe3a3e81bb63cbadc
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Jan 20 11:23:45 2011 +0100
Replace suitable equalsAscii calls with equalsAsciiL.
Done with sed -i 's%\(\.equalsAscii\)(\(\s\?"[^"]\+"\)\(\s\?\))%\1L(\3RTL_CONSTASCII_STRINGPARAM(\2\3)\3)%g'.
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 067b8c9..afd15fd 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1205,7 +1205,7 @@ void SfxLibraryContainer::implScanExtensions( void )
bool bPureDialogLib = false;
while( (aLibURL = aScriptIt.nextBasicOrDialogLibrary( bPureDialogLib )).getLength() > 0 )
{
- if( bPureDialogLib && maInfoFileName.equalsAscii( "script" ) )
+ if( bPureDialogLib && maInfoFileName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "script" ) ) )
continue;
// Extract lib name
@@ -1772,7 +1772,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
if ( bStorage )
{
// Don't write if only empty standard lib exists
- if ( ( nNameCount == 1 ) && ( aNames[0].equalsAscii( "Standard" ) ) )
+ if ( ( nNameCount == 1 ) && ( aNames[0].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Standard" ) ) ) )
{
Any aLibAny = maNameContainer.getByName( aNames[0] );
Reference< XNameAccess > xNameAccess;
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 921579f..67e5114 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -821,7 +821,7 @@ bool isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Referenc
const PropertyValue* pEnd = pIter + aArgs.getLength();
for(;pIter != pEnd;++pIter)
{
- if ( pIter->Name.equalsAscii("ComponentData") )
+ if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ComponentData")) )
{
Sequence<PropertyValue> aDocumentContext;
pIter->Value >>= aDocumentContext;
@@ -829,7 +829,7 @@ bool isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Referenc
const PropertyValue* pContextEnd = pContextIter + aDocumentContext.getLength();
for(;pContextIter != pContextEnd;++pContextIter)
{
- if ( pContextIter->Name.equalsAscii( "ActiveConnection" )
+ if ( pContextIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ActiveConnection" ) )
&& ( pContextIter->Value >>= _rxActualConnection )
)
{
diff --git a/connectivity/source/drivers/adabas/BColumns.cxx b/connectivity/source/drivers/adabas/BColumns.cxx
index 75fc652..13cafae 100644
--- a/connectivity/source/drivers/adabas/BColumns.cxx
+++ b/connectivity/source/drivers/adabas/BColumns.cxx
@@ -74,7 +74,7 @@ sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName)
sal_Int32 nPrec = xRow->getInt(7);
OAdabasCatalog::correctColumnProperties(nPrec,nType,sTypeName);
sal_Bool bAutoIncrement = sal_False;
- if ( !_rName.equalsAscii("DEFAULT") && !m_pTable->getSchema().equalsAscii("DOMAIN") && !m_pTable->getTableName().equalsAscii("COLUMNS") )
+ if ( !_rName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DEFAULT")) && !m_pTable->getSchema().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DOMAIN")) && !m_pTable->getTableName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("COLUMNS")) )
{
Reference< XStatement > xStmt = m_pTable->getMetaData()->getConnection()->createStatement( );
::rtl::OUString sQuery(RTL_CONSTASCII_USTRINGPARAM("SELECT \"DEFAULT\" FROM DOMAIN.COLUMNS WHERE OWNER = '"));
diff --git a/connectivity/source/drivers/adabas/BUser.cxx b/connectivity/source/drivers/adabas/BUser.cxx
index 67cec1e..98d61e4 100644
--- a/connectivity/source/drivers/adabas/BUser.cxx
+++ b/connectivity/source/drivers/adabas/BUser.cxx
@@ -171,7 +171,7 @@ void OAdabasUser::getAnyTablePrivileges(const ::rtl::OUString& objName, sal_Int3
continue;
nRights |= privileges[i].nNumericValue;
- if ( sPrivs.copy( nIndex + 2, 1 ).equalsAscii( "+" ) )
+ if ( sPrivs.copy( nIndex + 2, 1 ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "+" ) ) )
nRightsWithGrant |= privileges[i].nNumericValue;
}
}
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index df369d9..f056f61 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -125,9 +125,9 @@ void OEvoabConnection::construct(const ::rtl::OUString& url, const Sequence< Pro
}
}
- if (url.equalsAscii("sdbc:address:evolution:groupwise"))
+ if (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:groupwise")))
setSDBCAddressType(SDBCAddress::EVO_GWISE);
- else if (url.equalsAscii("sdbc:address:evolution:ldap"))
+ else if (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:ldap")))
setSDBCAddressType(SDBCAddress::EVO_LDAP);
else
setSDBCAddressType(SDBCAddress::EVO_LOCAL);
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index 8da7436..ae34a7e 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -182,7 +182,7 @@ sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion( ) throw(RuntimeException)
// --------------------------------------------------------------------------------
sal_Bool OEvoabDriver::acceptsURL_Stat( const ::rtl::OUString& url )
{
- return (url.equalsAscii("sdbc:address:evolution:local") || url.equalsAscii("sdbc:address:evolution:groupwise")||url.equalsAscii("sdbc:address:evolution:ldap"))&& EApiInit();
+ return (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:local")) || url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:groupwise"))||url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:ldap")))&& EApiInit();
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 7cdb58a..34888d1 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -335,7 +335,7 @@ namespace connectivity { namespace hsqldb
{
Reference< XRow > xValueAccess( xTableHsqlType, UNO_QUERY_THROW );
::rtl::OUString sTableType = xValueAccess->getString( 1 );
- bIsTextTable = sTableType.equalsAscii( "TEXT" );
+ bIsTextTable = sTableType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "TEXT" ) );
}
}
catch( const Exception& )
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index ff2cffc..735d94a 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -190,11 +190,11 @@ namespace connectivity
for (;pIter != pEnd; ++pIter)
{
- if ( pIter->Name.equalsAscii("Storage") )
+ if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Storage")) )
{
xStorage.set(pIter->Value,UNO_QUERY);
}
- else if ( pIter->Name.equalsAscii("URL") )
+ else if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
{
pIter->Value >>= sURL;
}
diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx
index 064934d..c91bb01 100644
--- a/connectivity/source/drivers/mozab/MConnection.cxx
+++ b/connectivity/source/drivers/mozab/MConnection.cxx
@@ -159,7 +159,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
//
sal_Int32 nLen = url.indexOf(':');
nLen = url.indexOf(':',nLen+1);
- OSL_ENSURE( url.copy( 0, nLen ).equalsAscii( "sdbc:address" ), "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" );
+ OSL_ENSURE( url.copy( 0, nLen ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "sdbc:address" ) ), "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" );
::rtl::OUString aAddrbookURI(url.copy(nLen+1));
// Get Scheme
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index d702012..40b1e17 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -108,7 +108,7 @@ namespace connectivity
{
sal_Bool isOdbcUrl(const ::rtl::OUString& _sUrl)
{
- return _sUrl.copy(0,16).equalsAscii("sdbc:mysql:odbc:");
+ return _sUrl.copy(0,16).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:mysql:odbc:"));
}
//--------------------------------------------------------------------
sal_Bool isNativeUrl(const ::rtl::OUString& _sUrl)
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 1ae2d2f..a423e17 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2626,7 +2626,7 @@ void Desktop::OpenClients()
OUString aPreloadData;
aPerfTuneIniFile.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "QuickstartPreloadConfiguration" )), aPreloadData, aDefault );
- if ( aPreloadData.equalsAscii( "1" ))
+ if ( aPreloadData.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "1" ) ))
{
if ( pArgs->IsWriter() ||
pArgs->IsCalc() ||
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index cee4db2..3ea394b 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -145,7 +145,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
);
rtl::OUString aDesktopEnvironment;
if ((aValue >>= aDesktopEnvironment)
- && aDesktopEnvironment.equalsAscii("GNOME"))
+ && aDesktopEnvironment.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME")))
{
Reference<XContentProviderManager> xCPM =
cb->getContentProviderManagerInterface();
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index a443466..858c5ce 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -483,7 +483,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
OUString aUserInstallPathHashCode;
- if ( aPreloadData.equalsAscii( "1" ))
+ if ( aPreloadData.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "1" ) ))
{
sal_Char szBuffer[32];
sprintf( szBuffer, "%d", SUPD );
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 863c90c..1639510 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -110,7 +110,7 @@ static const ::rtl::OUString MIGRATION_STAMP_NAME(RTL_CONSTASCII_USTRINGPARAM("/
{
for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
{
- if ( aPropSeq[i].Name.equalsAscii( "Label" ))
+ if ( aPropSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Label" ) ))
{
aPropSeq[i].Value >>= aStr;
break;
diff --git a/desktop/source/migration/services/autocorrmigration.cxx b/desktop/source/migration/services/autocorrmigration.cxx
index 80c0aa4..4b12969 100644
--- a/desktop/source/migration/services/autocorrmigration.cxx
+++ b/desktop/source/migration/services/autocorrmigration.cxx
@@ -242,7 +242,7 @@ namespace migration
{
beans::NamedValue aValue;
*pIter >>= aValue;
- if ( aValue.Name.equalsAscii( "UserData" ) )
+ if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserData" ) ) )
{
if ( !(aValue.Value >>= m_sSourceDir) )
{
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index 4ed093c..fa3fa81 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -231,7 +231,7 @@ namespace migration
{
beans::NamedValue aValue;
*pIter >>= aValue;
- if ( aValue.Name.equalsAscii( "UserData" ) )
+ if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserData" ) ) )
{
if ( !(aValue.Value >>= m_sSourceDir) )
{
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 623389b..6978ce0 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -277,7 +277,7 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
for(;pIter != pEnd;++pIter)
{
*pIter >>= aValue;
- if (aValue.Name.equalsAscii("OldConfiguration"))
+ if (aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OldConfiguration")))
{
sal_Bool bSuccess = aValue.Value >>= aOldConfigValues;
OSL_ENSURE(bSuccess == sal_True, "[Service implementation " IMPL_NAME
@@ -288,7 +288,7 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
const css::beans::NamedValue* pEnd2 = pIter2 + aOldConfigValues.getLength();
for(;pIter2 != pEnd2;++pIter2)
{
- if ( pIter2->Name.equalsAscii("org.openoffice.Office.Java") )
+ if ( pIter2->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("org.openoffice.Office.Java")) )
{
pIter2->Value >>= m_xLayer;
break;
@@ -296,7 +296,7 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
}
}
}
- else if (aValue.Name.equalsAscii("UserData"))
+ else if (aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserData")))
{
if ( !(aValue.Value >>= m_sUserDir) )
{
@@ -420,9 +420,9 @@ void SAL_CALL JavaMigration::overrideProperty(
MalformedDataException,
WrappedTargetException )
{
- if (aName.equalsAscii("Enable"))
+ if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Enable")))
m_aStack.push(TElementStack::value_type(aName,ENABLE_JAVA));
- else if (aName.equalsAscii("UserClassPath"))
+ else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserClassPath")))
m_aStack.push(TElementStack::value_type(aName, USER_CLASS_PATH));
}
// -----------------------------------------------------------------------------
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index c4586a9..bf61dbb 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -415,14 +415,14 @@ void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments ) thro
{
beans::NamedValue aValue;
*pIter >>= aValue;
- if ( aValue.Name.equalsAscii( "UserData" ) )
+ if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserData" ) ) )
{
if ( !(aValue.Value >>= m_sSourceDir) )
{
OSL_ENSURE( false, "ExtensionMigration::initialize: argument UserData has wrong type!" );
}
}
- else if ( aValue.Name.equalsAscii( "ExtensionBlackList" ) )
+ else if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExtensionBlackList" ) ) )
{
Sequence< ::rtl::OUString > aBlackList;
if ( (aValue.Value >>= aBlackList ) && ( aBlackList.getLength() > 0 ))
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 152cded..4900c02 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -279,7 +279,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile )
{
beans::NamedValue aValue;
*pIter >>= aValue;
- if ( aValue.Name.equalsAscii( "UserData" ) )
+ if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserData" ) ) )
{
if ( !(aValue.Value >>= m_sSourceDir) )
{
diff --git a/desktop/source/so_comp/evaluation.cxx b/desktop/source/so_comp/evaluation.cxx
index ac38a12..c55b945 100644
--- a/desktop/source/so_comp/evaluation.cxx
+++ b/desktop/source/so_comp/evaluation.cxx
@@ -145,9 +145,9 @@ rtl::OUString SAL_CALL SOEvaluation::getExactName( const rtl::OUString& rApproxi
for (int i=0; i<aSeq.getLength(); i++ )
{
NamedValue& rValue = aSeq[i];
- if ( rValue.Name.equalsAscii("expired") )
+ if ( rValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("expired")) )
rValue.Value >>= bExpired;
- else if (rValue.Name.equalsAscii("title") )
+ else if (rValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("title")) )
rValue.Value >>= aEval;
}
// append eval string to title
diff --git a/desktop/source/so_comp/oemjob.cxx b/desktop/source/so_comp/oemjob.cxx
index 4e9ec6c..842dd9c 100644
--- a/desktop/source/so_comp/oemjob.cxx
+++ b/desktop/source/so_comp/oemjob.cxx
@@ -177,13 +177,13 @@ throw ( RuntimeException )
Reference<XCloseable> rClose;
for (int i=0; i<args.getLength(); i++)
{
- if (args[i].Name.equalsAscii("EnvType"))
+ if (args[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EnvType")))
args[i].Value >>= aEnvType;
- else if (args[i].Name.equalsAscii("Frame")) {
+ else if (args[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Frame"))) {
args[i].Value >>= rFrame;
rClose = Reference<XCloseable>(rFrame, UNO_QUERY);
}
- else if (args[i].Name.equalsAscii("Model")) {
+ else if (args[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Model"))) {
args[i].Value >>= rModel;
rClose = Reference<XCloseable>(rModel, UNO_QUERY);
}
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index a74ec8c..c75df69 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -116,15 +116,15 @@ void OCommonEmbeddedObject::CommonInit_Impl( const uno::Sequence< beans::NamedVa
// TODO/LATER: in future UI names can be also provided here
for ( sal_Int32 nInd = 0; nInd < aObjectProps.getLength(); nInd++ )
{
- if ( aObjectProps[nInd].Name.equalsAscii( "ClassID" ) )
+ if ( aObjectProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ClassID" ) ) )
aObjectProps[nInd].Value >>= m_aClassID;
- else if ( aObjectProps[nInd].Name.equalsAscii( "ObjectDocumentServiceName" ) )
+ else if ( aObjectProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ObjectDocumentServiceName" ) ) )
aObjectProps[nInd].Value >>= m_aDocServiceName;
- else if ( aObjectProps[nInd].Name.equalsAscii( "ObjectDocumentFilterName" ) )
+ else if ( aObjectProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ObjectDocumentFilterName" ) ) )
aObjectProps[nInd].Value >>= m_aPresetFilterName;
- else if ( aObjectProps[nInd].Name.equalsAscii( "ObjectMiscStatus" ) )
+ else if ( aObjectProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ObjectMiscStatus" ) ) )
aObjectProps[nInd].Value >>= m_nMiscStatus;
- else if ( aObjectProps[nInd].Name.equalsAscii( "ObjectVerbs" ) )
+ else if ( aObjectProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ObjectVerbs" ) ) )
aObjectProps[nInd].Value >>= m_aObjectVerbs;
}
@@ -234,9 +234,9 @@ void OCommonEmbeddedObject::LinkInit_Impl(
// setPersistance has no effect on own links, so the complete initialization must be done here
for ( sal_Int32 nInd = 0; nInd < aMediaDescr.getLength(); nInd++ )
- if ( aMediaDescr[nInd].Name.equalsAscii( "URL" ) )
+ if ( aMediaDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
aMediaDescr[nInd].Value >>= m_aLinkURL;
- else if ( aMediaDescr[nInd].Name.equalsAscii( "FilterName" ) )
+ else if ( aMediaDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ) )
aMediaDescr[nInd].Value >>= m_aLinkFilterName;
OSL_ENSURE( m_aLinkURL.getLength() && m_aLinkFilterName.getLength(), "Filter and URL must be provided!\n" );
@@ -245,12 +245,12 @@ void OCommonEmbeddedObject::LinkInit_Impl(
uno::Reference< frame::XDispatchProviderInterceptor > xDispatchInterceptor;
for ( sal_Int32 nObjInd = 0; nObjInd < aObjectDescr.getLength(); nObjInd++ )
- if ( aObjectDescr[nObjInd].Name.equalsAscii( "OutplaceDispatchInterceptor" ) )
+ if ( aObjectDescr[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutplaceDispatchInterceptor" ) ) )
{
aObjectDescr[nObjInd].Value >>= xDispatchInterceptor;
break;
}
- else if ( aObjectDescr[nObjInd].Name.equalsAscii( "Parent" ) )
+ else if ( aObjectDescr[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Parent" ) ) )
{
aObjectDescr[nObjInd].Value >>= m_xParent;
}
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index edb1c8f..eedf482 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -79,21 +79,21 @@ uno::Sequence< beans::PropertyValue > GetValuableArgs_Impl( const uno::Sequence<
for ( sal_Int32 nInd = 0; nInd < aMedDescr.getLength(); nInd++ )
{
- if ( aMedDescr[nInd].Name.equalsAscii( "ComponentData" )
- || aMedDescr[nInd].Name.equalsAscii( "DocumentTitle" )
- || aMedDescr[nInd].Name.equalsAscii( "InteractionHandler" )
- || aMedDescr[nInd].Name.equalsAscii( "JumpMark" )
- // || aMedDescr[nInd].Name.equalsAscii( "Password" ) makes no sence for embedded objects
- || aMedDescr[nInd].Name.equalsAscii( "Preview" )
- || aMedDescr[nInd].Name.equalsAscii( "ReadOnly" )
- || aMedDescr[nInd].Name.equalsAscii( "StartPresentation" )
- || aMedDescr[nInd].Name.equalsAscii( "RepairPackage" )
- || aMedDescr[nInd].Name.equalsAscii( "StatusIndicator" )
- || aMedDescr[nInd].Name.equalsAscii( "ViewData" )
- || aMedDescr[nInd].Name.equalsAscii( "ViewId" )
- || aMedDescr[nInd].Name.equalsAscii( "MacroExecutionMode" )
- || aMedDescr[nInd].Name.equalsAscii( "UpdateDocMode" )
- || (aMedDescr[nInd].Name.equalsAscii( "DocumentBaseURL" ) && bCanUseDocumentBaseURL) )
+ if ( aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ComponentData" ) )
+ || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentTitle" ) )
+ || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InteractionHandler" ) )
+ || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "JumpMark" ) )
+ // || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Password" ) ) makes no sence for embedded objects
+ || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Preview" ) )
+ || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ReadOnly" ) )
+ || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StartPresentation" ) )
+ || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ) )
+ || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ) )
+ || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ViewData" ) )
+ || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ViewId" ) )
+ || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MacroExecutionMode" ) )
+ || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UpdateDocMode" ) )
+ || (aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentBaseURL" ) ) && bCanUseDocumentBaseURL) )
{
aResult.realloc( ++nResLen );
aResult[nResLen-1] = aMedDescr[nInd];
@@ -113,7 +113,7 @@ uno::Sequence< beans::PropertyValue > addAsTemplate( const uno::Sequence< beans:
for ( sal_Int32 nInd = 0; nInd < nLength; nInd++ )
{
aResult[nInd].Name = aOrig[nInd].Name;
- if ( aResult[nInd].Name.equalsAscii( "AsTemplate" ) )
+ if ( aResult[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "AsTemplate" ) ) )
{
aResult[nInd].Value <<= sal_True;
bAsTemplateSet = sal_True;
@@ -1003,32 +1003,32 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
m_bReadOnly = sal_False;
for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ )
- if ( lArguments[nInd].Name.equalsAscii( "ReadOnly" ) )
+ if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ReadOnly" ) ) )
lArguments[nInd].Value >>= m_bReadOnly;
// TODO: use lObjArgs for StoreVisualReplacement
for ( sal_Int32 nObjInd = 0; nObjInd < lObjArgs.getLength(); nObjInd++ )
- if ( lObjArgs[nObjInd].Name.equalsAscii( "OutplaceDispatchInterceptor" ) )
+ if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutplaceDispatchInterceptor" ) ) )
{
uno::Reference< frame::XDispatchProviderInterceptor > xDispatchInterceptor;
if ( lObjArgs[nObjInd].Value >>= xDispatchInterceptor )
m_pDocHolder->SetOutplaceDispatchInterceptor( xDispatchInterceptor );
}
- else if ( lObjArgs[nObjInd].Name.equalsAscii( "DefaultParentBaseURL" ) )
+ else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DefaultParentBaseURL" ) ) )
{
lObjArgs[nObjInd].Value >>= m_aDefaultParentBaseURL;
}
- else if ( lObjArgs[nObjInd].Name.equalsAscii( "Parent" ) )
+ else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Parent" ) ) )
{
lObjArgs[nObjInd].Value >>= m_xParent;
}
- else if ( lObjArgs[nObjInd].Name.equalsAscii( "IndividualMiscStatus" ) )
+ else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IndividualMiscStatus" ) ) )
{
sal_Int64 nMiscStatus=0;
lObjArgs[nObjInd].Value >>= nMiscStatus;
m_nMiscStatus |= nMiscStatus;
}
- else if ( lObjArgs[nObjInd].Name.equalsAscii( "CloneFrom" ) )
+ else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CloneFrom" ) ) )
{
uno::Reference < embed::XEmbeddedObject > xObj;
lObjArgs[nObjInd].Value >>= xObj;
@@ -1039,7 +1039,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
m_nClonedMapUnit = xObj->getMapUnit( embed::Aspects::MSOLE_CONTENT );
}
}
- else if ( lObjArgs[nObjInd].Name.equalsAscii( "OutplaceFrameProperties" ) )
+ else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutplaceFrameProperties" ) ) )
{
uno::Sequence< uno::Any > aOutFrameProps;
uno::Sequence< beans::NamedValue > aOutFramePropsTyped;
@@ -1063,19 +1063,19 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
else
OSL_ENSURE( false, "OCommonEmbeddedObject::setPersistentEntry: illegal type for argument 'OutplaceFrameProperties'!" );
}
- else if ( lObjArgs[nObjInd].Name.equalsAscii( "ModuleName" ) )
+ else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ModuleName" ) ) )
{
lObjArgs[nObjInd].Value >>= m_aModuleName;
}
- else if ( lObjArgs[nObjInd].Name.equalsAscii( "EmbeddedScriptSupport" ) )
+ else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EmbeddedScriptSupport" ) ) )
{
OSL_VERIFY( lObjArgs[nObjInd].Value >>= m_bEmbeddedScriptSupport );
}
- else if ( lObjArgs[nObjInd].Name.equalsAscii( "DocumentRecoverySupport" ) )
+ else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentRecoverySupport" ) ) )
{
OSL_VERIFY( lObjArgs[nObjInd].Value >>= m_bDocumentRecoverySupport );
}
- else if ( lObjArgs[nObjInd].Name.equalsAscii( "RecoveryStorage" ) )
+ else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RecoveryStorage" ) ) )
{
OSL_VERIFY( lObjArgs[nObjInd].Value >>= m_xRecoveryStorage );
}
@@ -1209,7 +1209,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
// StoreVisualReplacement and VisualReplacement args have no sence here
- if ( lObjArgs[nInd].Name.equalsAscii( "CanTryOptimization" ) )
+ if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CanTryOptimization" ) ) )
lObjArgs[nInd].Value >>= bTryOptimization;
}
@@ -1342,7 +1342,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
// StoreVisualReplacement and VisualReplacement args have no sence here
- if ( lObjArgs[nInd].Name.equalsAscii( "CanTryOptimization" ) )
+ if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CanTryOptimization" ) ) )
lObjArgs[nInd].Value >>= bTryOptimization;
}
@@ -1693,13 +1693,13 @@ void SAL_CALL OCommonEmbeddedObject::reload(
::rtl::OUString aNewLinkFilter;
for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ )
{
- if ( lArguments[nInd].Name.equalsAscii( "URL" ) )
+ if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
{
// the new URL
lArguments[nInd].Value >>= m_aLinkURL;
m_aLinkFilterName = ::rtl::OUString();
}
- else if ( lArguments[nInd].Name.equalsAscii( "FilterName" ) )
+ else if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ) )
{
lArguments[nInd].Value >>= aNewLinkFilter;
m_aLinkFilterName = ::rtl::OUString();
@@ -1736,7 +1736,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
// TODO: use lObjArgs for StoreVisualReplacement
for ( sal_Int32 nObjInd = 0; nObjInd < lObjArgs.getLength(); nObjInd++ )
- if ( lObjArgs[nObjInd].Name.equalsAscii( "OutplaceDispatchInterceptor" ) )
+ if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutplaceDispatchInterceptor" ) ) )
{
uno::Reference< frame::XDispatchProviderInterceptor > xDispatchInterceptor;
if ( lObjArgs[nObjInd].Value >>= xDispatchInterceptor )
@@ -1752,7 +1752,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
m_bReadOnly = sal_False;
for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ )
- if ( lArguments[nInd].Name.equalsAscii( "ReadOnly" ) )
+ if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ReadOnly" ) ) )
lArguments[nInd].Value >>= m_bReadOnly;
if ( bOldReadOnlyValue != m_bReadOnly && !m_bIsLink )
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx
index dcc24a3..3fa388d 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -358,7 +358,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
// check if there is URL, URL must exist
::rtl::OUString aURL;
for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ )
- if ( aTempMedDescr[nInd].Name.equalsAscii( "URL" ) )
+ if ( aTempMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
aTempMedDescr[nInd].Value >>= aURL;
if ( !aURL.getLength() )
@@ -424,7 +424,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
::rtl::OUString aURL;
for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ )
- if ( aTempMedDescr[nInd].Name.equalsAscii( "URL" ) )
+ if ( aTempMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
aTempMedDescr[nInd].Value >>= aURL;
if ( !aURL.getLength() )
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index c7d4104..6bc2074 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -620,7 +620,7 @@ void DocumentHolder::FindConnectPoints(
xMenu->getByIndex( nInd ) >>= aProps;
rtl::OUString aCommand;
for ( sal_Int32 nSeqInd = 0; nSeqInd < aProps.getLength(); nSeqInd++ )
- if ( aProps[nSeqInd].Name.equalsAscii( "CommandURL" ) )
+ if ( aProps[nSeqInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CommandURL" ) ) )
{
aProps[nSeqInd].Value >>= aCommand;
break;
@@ -629,9 +629,9 @@ void DocumentHolder::FindConnectPoints(
if ( !aCommand.getLength() )
throw uno::RuntimeException();
- if ( aCommand.equalsAscii( ".uno:PickList" ) )
+ if ( aCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:PickList" ) ) )
nConnectPoints[0] = nInd;
- else if ( aCommand.equalsAscii( ".uno:WindowList" ) )
+ else if ( aCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:WindowList" ) ) )
nConnectPoints[1] = nInd;
}
}
@@ -1239,11 +1239,11 @@ void SAL_CALL DocumentHolder::notifyEvent( const document::EventObject& Event )
if( m_pEmbedObj && Event.Source == m_xComponent )
{
// for now the ignored events are not forwarded, but sent by the object itself
- if ( !Event.EventName.equalsAscii( "OnSave" )
- && !Event.EventName.equalsAscii( "OnSaveDone" )
- && !Event.EventName.equalsAscii( "OnSaveAs" )
- && !Event.EventName.equalsAscii( "OnSaveAsDone" )
- && !( Event.EventName.equalsAscii( "OnVisAreaChanged" ) && m_nNoResizeReact ) )
+ if ( !Event.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnSave" ) )
+ && !Event.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnSaveDone" ) )
+ && !Event.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnSaveAs" ) )
+ && !Event.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnSaveAsDone" ) )
+ && !( Event.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnVisAreaChanged" ) ) && m_nNoResizeReact ) )
m_pEmbedObj->PostEvent_Impl( Event.EventName, Event.Source );
}
}
diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index 52cc9ee..6877691 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -173,7 +173,7 @@ Interceptor::dispatch(
while( nInd < aNewArgs.getLength() )
{
- if ( aNewArgs[nInd].Name.equalsAscii( "SaveTo" ) )
+ if ( aNewArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SaveTo" ) ) )
{
aNewArgs[nInd].Value <<= sal_True;
break;
diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index 2f9c3a2..f91d345 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -369,7 +369,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
// check if there is URL, URL must exist
::rtl::OUString aURL;
for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ )
- if ( aTempMedDescr[nInd].Name.equalsAscii( "URL" ) )
+ if ( aTempMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
aTempMedDescr[nInd].Value >>= aURL;
if ( !aURL.getLength() )
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index 4ff0bd4..0d66dc7 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -1599,7 +1599,7 @@ uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor&
// TODO: Investigate if there is already the format name
// and whether this format is really required
else if ( aFlavor.DataType == getCppuType( ( const uno::Reference< io::XInputStream >* ) 0 )
- && aFlavor.MimeType.equalsAscii( "application/x-openoffice-contentstream" ) )
+ && aFlavor.MimeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/x-openoffice-contentstream" ) ) )
{
// allow to retrieve stream-representation of the object persistence
bSupportedFlavor = sal_True;
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 4802b31..2ea4751 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -296,7 +296,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo()
if ( aFilterAnyData >>= aFilterData )
{
for ( sal_Int32 nInd = 0; nInd < aFilterData.getLength(); nInd++ )
- if ( aFilterData[nInd].Name.equalsAscii( "DocumentService" ) )
+ if ( aFilterData[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentService" ) ) )
aFilterData[nInd].Value >>= aDocServiceName;
}
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 805f382..61e6e4d 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -1149,11 +1149,11 @@ void OleEmbeddedObject::StoreToLocation_Impl(
uno::Reference< io::XStream > xCachedVisualRepresentation;
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
- if ( lObjArgs[nInd].Name.equalsAscii( "StoreVisualReplacement" ) )
+ if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StoreVisualReplacement" ) ) )
lObjArgs[nInd].Value >>= bStoreVis;
- else if ( lObjArgs[nInd].Name.equalsAscii( "VisualReplacement" ) )
+ else if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VisualReplacement" ) ) )
lObjArgs[nInd].Value >>= xCachedVisualRepresentation;
- else if ( lObjArgs[nInd].Name.equalsAscii( "CanTryOptimization" ) )
+ else if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CanTryOptimization" ) ) )
lObjArgs[nInd].Value >>= bTryOptimization;
}
@@ -1410,7 +1410,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
m_bReadOnly = sal_False;
sal_Int32 nInd = 0;
for ( nInd = 0; nInd < lArguments.getLength(); nInd++ )
- if ( lArguments[nInd].Name.equalsAscii( "ReadOnly" ) )
+ if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ReadOnly" ) ) )
lArguments[nInd].Value >>= m_bReadOnly;
#ifdef WNT
@@ -1420,7 +1420,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
SwitchOwnPersistence( xStorage, sEntName );
for ( nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
- if ( lObjArgs[nInd].Name.equalsAscii( "StoreVisualReplacement" ) )
+ if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StoreVisualReplacement" ) ) )
lObjArgs[nInd].Value >>= m_bStoreVisRepl;
#ifdef WNT
@@ -1488,7 +1488,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
// use URL ( may be content or stream later ) from MediaDescriptor to initialize object
::rtl::OUString aURL;
for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ )
- if ( lArguments[nInd].Name.equalsAscii( "URL" ) )
+ if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
lArguments[nInd].Value >>= aURL;
if ( !aURL.getLength() )
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 7a7d19b..7924e69 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -241,7 +241,7 @@ sal_Bool OwnView_Impl::CreateModel( sal_Bool bUseNative )
::rtl::OUString aFilterName;
for ( sal_Int32 nInd = 0; nInd < aArgs.getLength(); nInd++ )
- if ( aArgs[nInd].Name.equalsAscii( "FilterName" ) )
+ if ( aArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ) )
aArgs[nInd].Value >>= aFilterName;
if ( !aFilterName.getLength() && aTypeName.getLength() )
@@ -254,7 +254,7 @@ sal_Bool OwnView_Impl::CreateModel( sal_Bool bUseNative )
{
for ( sal_Int32 nInd = 0; nInd < aTypes.getLength(); nInd++ )
{
- if ( aTypes[nInd].Name.equalsAscii( "PreferredFilter" ) && ( aTypes[nInd].Value >>= aFilterName ) )
+ if ( aTypes[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PreferredFilter" ) ) && ( aTypes[nInd].Value >>= aFilterName ) )
{
aTypes[nInd].Value >>= aFilterName;
break;
@@ -609,7 +609,7 @@ void SAL_CALL OwnView_Impl::notifyEvent( const document::EventObject& aEvent )
{
::osl::MutexGuard aGuard( m_aMutex );
- if ( aEvent.Source == m_xModel && aEvent.EventName.equalsAscii( "OnSaveAsDone" ) )
+ if ( aEvent.Source == m_xModel && aEvent.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnSaveAsDone" ) ) )
{
// SaveAs operation took place, so just forget the model and deregister listeners
xModel = m_xModel;
diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx
index f35af3a..64339da 100644
--- a/embeddedobj/source/msole/xolefactory.cxx
+++ b/embeddedobj/source/msole/xolefactory.cxx
@@ -123,7 +123,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
- if ( lObjArgs[nInd].Name.equalsAscii( "CloneFrom" ) )
+ if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CloneFrom" ) ) )
{
try
{
diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
index e85b94b..aa00502 100644
--- a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
+++ b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
@@ -71,7 +71,7 @@ uno::Any SAL_CALL UNOMainThreadExecutor::execute( const uno::Sequence< beans::Na
{
uno::Reference< task::XJob > xJob;
- if ( aArguments.getLength() > 0 && aArguments[0].Name.equalsAscii( "JobToExecute" ) )
+ if ( aArguments.getLength() > 0 && aArguments[0].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "JobToExecute" ) ) )
aArguments[0].Value >>= xJob;
if ( !xJob.is() )
diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
index a6b707c..63628cb 100644
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
@@ -68,7 +68,7 @@ uno::Any SAL_CALL MainThreadExecutor::execute( const uno::Sequence< beans::Named
sal_Int32 nValuesSize = 0;
for ( sal_Int32 nInd = 0; nInd < aArguments.getLength(); nInd++ )
- if ( aArguments[nInd].Name.equalsAscii( "JobToExecute" ) )
+ if ( aArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "JobToExecute" ) ) )
aArguments[nInd].Value >>= xJob;
else
{
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index e5ab24f..0114762 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -1107,19 +1107,19 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
//-------------------------------------------------------------------------
sal_Bool SvtFilePicker::implHandleInitializationArgument( const ::rtl::OUString& _rName, const Any& _rValue ) SAL_THROW( ( Exception, RuntimeException ) )
{
- if ( _rName.equalsAscii( "TemplateDescription" ) )
+ if ( _rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "TemplateDescription" ) ) )
{
m_nServiceType = TemplateDescription::FILEOPEN_SIMPLE;
OSL_VERIFY( _rValue >>= m_nServiceType );
return sal_True;
}
- if ( _rName.equalsAscii( "StandardDir" ) )
+ if ( _rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StandardDir" ) ) )
{
OSL_VERIFY( _rValue >>= m_aStandardDir );
return sal_True;
}
- if ( _rName.equalsAscii( "BlackList" ) )
+ if ( _rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BlackList" ) ) )
{
OSL_VERIFY( _rValue >>= m_aBlackList );
return sal_True;
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 77dfac0..ea67a5e 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -490,7 +490,7 @@ namespace svt
sal_Bool OCommonPicker::implHandleInitializationArgument( const ::rtl::OUString& _rName, const Any& _rValue ) SAL_THROW( ( Exception, RuntimeException ) )
{
sal_Bool bKnown = sal_True;
- if ( _rName.equalsAscii( "ParentWindow" ) )
+ if ( _rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ParentWindow" ) ) )
{
m_xDialogParent.clear();
OSL_VERIFY( _rValue >>= m_xDialogParent );
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index f69dbcf..ca0ffb8 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -2062,7 +2062,7 @@ short SvtFileDialog::PrepareExecute()
{
rtl::OUString aEnvValue;
if ( getEnvironmentValue( "WorkDirMustContainRemovableMedia", aEnvValue ) &&
- aEnvValue.equalsAscii( "1" ) )
+ aEnvValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "1" ) ) )
{
try
{
diff --git a/fpicker/source/unx/kde_unx/UnxCommandThread.cxx b/fpicker/source/unx/kde_unx/UnxCommandThread.cxx
index cc19ae3..3b11334 100644
--- a/fpicker/source/unx/kde_unx/UnxCommandThread.cxx
+++ b/fpicker/source/unx/kde_unx/UnxCommandThread.cxx
@@ -188,27 +188,27 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
::rtl::OUString aCommandName = aList.front();
aList.pop_front();
- if ( aCommandName.equalsAscii( "accept" ) )
+ if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "accept" ) ) )
{
m_aResult = sal_True;
m_aExecCondition.set();
}
- else if ( aCommandName.equalsAscii( "reject" ) )
+ else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "reject" ) ) )
{
m_aResult = sal_False;
m_aExecCondition.set();
}
- else if ( aCommandName.equalsAscii( "fileSelectionChanged" ) )
+ else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "fileSelectionChanged" ) ) )
{
if ( m_pNotifyThread )
m_pNotifyThread->fileSelectionChanged();
}
- else if ( aCommandName.equalsAscii( "files" ) )
+ else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "files" ) ) )
{
m_aGetFiles = aList;
m_aGetFilesCondition.set();
}
- else if ( aCommandName.equalsAscii( "value" ) )
+ else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "value" ) ) )
{
::rtl::OUString aType;
if ( !aList.empty() )
@@ -217,14 +217,14 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
aList.pop_front();
}
- if ( aType.equalsAscii( "bool" ) )
+ if ( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "bool" ) ) )
{
sal_Bool bValue = !aList.empty() && aList.front().equalsIgnoreAsciiCaseAscii( "true" );
m_aGetValue <<= bValue;
m_aGetValueCondition.set();
}
- else if ( aType.equalsAscii( "int" ) )
+ else if ( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "int" ) ) )
{
sal_Int32 nValue = 0;
if ( !aList.empty() )
@@ -233,7 +233,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
m_aGetValue <<= nValue;
m_aGetValueCondition.set();
}
- else if ( aType.equalsAscii( "string" ) )
+ else if ( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "string" ) ) )
{
::rtl::OUString aValue;
if ( !aList.empty() )
@@ -242,7 +242,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
m_aGetValue <<= aValue;
m_aGetValueCondition.set();
}
- else if ( aType.equalsAscii( "stringList" ) )
+ else if ( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "stringList" ) ) )
{
uno::Sequence< ::rtl::OUString > aSequence( aList.size() );
sal_Int32 nIdx = 0;
@@ -258,12 +258,12 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
m_aGetValueCondition.set();
}
}
- else if ( aCommandName.equalsAscii( "currentFilter" ) )
+ else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "currentFilter" ) ) )
{
m_aGetCurrentFilter = aList.empty()? ::rtl::OUString(): aList.front();
m_aGetCurrentFilterCondition.set();
}
- else if ( aCommandName.equalsAscii( "currentDirectory" ) )
+ else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "currentDirectory" ) ) )
{
m_aGetDirectory = aList.empty()? ::rtl::OUString(): aList.front();
m_aGetDirectoryCondition.set();
diff --git a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
index e280d83..8c7cd91 100644
--- a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
+++ b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
@@ -339,7 +339,7 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA
aBuffer.appendAscii( " ", 1 );
aBuffer.append( aAction );
- if ( aType.equalsAscii( "checkbox" ) )
+ if ( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "checkbox" ) ) )
{
sal_Bool bControlValue;
if ( ( rValue >>= bControlValue ) && bControlValue )
@@ -347,7 +347,7 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA
else
aBuffer.appendAscii( " false" );
}
- else if ( aType.equalsAscii( "listbox" ) )
+ else if ( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "listbox" ) ) )
{
switch ( nControlAction )
{
diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx
index 9d0a16d..c5effdc 100644
--- a/framework/source/accelerators/keymapping.cxx
+++ b/framework/source/accelerators/keymapping.cxx
@@ -227,7 +227,7 @@ sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUStr
// 0 is normaly an error of the called method toInt32() ...
// But we must be aware, that the identifier is "0"!
rCode = 0;
- return sIdentifier.equalsAscii("0");
+ return sIdentifier.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("0"));
}
} // namespace framework
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index e6b4575..f163f91 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -352,17 +352,17 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
beans::NamedValue aValue = rProperties[i];
::rtl::OUString sName = aValue.Name;
- if ( sName.equalsAscii("Title") )
+ if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title")) )
aValue.Value >>= sTitle;
- else if ( sName.equalsAscii("ToolTip") )
+ else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ToolTip")) )
aValue.Value >>= sToolTip;
- else if ( sName.equalsAscii("PageURL") )
+ else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PageURL")) )
aValue.Value >>= sPageURL;
- else if ( sName.equalsAscii("EventHdl") )
+ else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EventHdl")) )
aValue.Value >>= xEventHdl;
- else if ( sName.equalsAscii("Image") )
+ else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Image")) )
aValue.Value >>= xImage;
- else if ( sName.equalsAscii("Disabled") )
+ else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Disabled")) )
aValue.Value >>= bDisabled;
}
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 4b7695a..e877111 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -238,7 +238,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
sal_Bool bIsSynchron = sal_False;
for (sal_Int32 nArgs=0; nArgs<lArguments.getLength(); nArgs++ )
{
- if ( lArguments[nArgs].Name.equalsAscii("SynchronMode") )
+ if ( lArguments[nArgs].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SynchronMode")) )
{
lArguments[nArgs].Value >>= bIsSynchron;
break;
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 54c3bd2..9977ece 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -137,9 +137,9 @@ throw ( Exception, RuntimeException )
PropertyValue aPropValue;
if ( aArguments[n] >>= aPropValue )
{
- if ( aPropValue.Name.equalsAscii( "ResourceURL" ))
+ if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ResourceURL" ) ))
aPropValue.Value >>= m_aResourceURL;
- else if ( aPropValue.Name.equalsAscii( "Frame" ))
+ else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Frame" ) ))
{
Reference< XFrame > xFrame;
aPropValue.Value >>= xFrame;
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 0d94810..0d65e2e 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -224,11 +224,11 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args)
{
if (args[i] >>= v)
{
- if (v.Name.equalsAscii("SessionManagerName"))
+ if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SessionManagerName")))
v.Value >>= aSMgr;
- else if (v.Name.equalsAscii("SessionManager"))
+ else if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SessionManager")))
v.Value >>= m_rSessionManager;
- else if (v.Name.equalsAscii("AllowUserInteractionOnQuit"))
+ else if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AllowUserInteractionOnQuit")))
v.Value >>= m_bAllowUserInteractionOnQuit;
}
}
@@ -246,14 +246,14 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args)
void SAL_CALL SessionListener::statusChanged(const FeatureStateEvent& event)
throw (css::uno::RuntimeException)
{
- if (event.FeatureURL.Complete.equalsAscii("vnd.sun.star.autorecovery:/doSessionRestore"))
+ if (event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.autorecovery:/doSessionRestore")))
{
if (event.FeatureDescriptor.compareToAscii("update")==0)
m_bRestored = sal_True; // a document was restored
// if (event.FeatureDescriptor.compareToAscii("stop")==0)
}
- else if (event.FeatureURL.Complete.equalsAscii("vnd.sun.star.autorecovery:/doSessionSave"))
+ else if (event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.autorecovery:/doSessionSave")))
{
if (event.FeatureDescriptor.compareToAscii("stop")==0)
{
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index 93c5d46..2a4310b 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -124,7 +124,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument
PropertyValue aPropValue;
if ( aArguments[n] >>= aPropValue )
{
- if ( aPropValue.Name.equalsAscii( "ConfigurationData" ))
+ if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ConfigurationData" ) ))
aPropValue.Value >>= m_aConfigData;
}
}
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index 6832a5d..c2b8e48 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -152,11 +152,11 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException
{
if ( aArguments[i] >>= aPropValue )
{
- if ( aPropValue.Name.equalsAscii( "Frame" ))
+ if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Frame" ) ))
m_xFrame.set(aPropValue.Value,UNO_QUERY);
- else if ( aPropValue.Name.equalsAscii( "CommandURL" ))
+ else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CommandURL" ) ))
aPropValue.Value >>= m_aCommandURL;
- else if ( aPropValue.Name.equalsAscii( "ServiceManager" ))
+ else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ServiceManager" ) ))
m_xServiceManager.set(aPropValue.Value,UNO_QUERY);
}
}
diff --git a/framework/source/uielement/constitemcontainer.cxx b/framework/source/uielement/constitemcontainer.cxx
index e84382e..0b99dbd 100644
--- a/framework/source/uielement/constitemcontainer.cxx
+++ b/framework/source/uielement/constitemcontainer.cxx
@@ -220,7 +220,7 @@ ConstItemContainer::ConstItemContainer( const Reference< XIndexAccess >& rSource
Reference< XIndexAccess > xIndexAccess;
for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ )
{
- if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" ))
+ if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) ))
{
aPropSeq[j].Value >>= xIndexAccess;
nContainerIndex = j;
@@ -257,7 +257,7 @@ void ConstItemContainer::copyItemContainer( const std::vector< Sequence< Propert
Reference< XIndexAccess > xIndexAccess;
for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ )
{
- if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" ))
+ if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) ))
{
aPropSeq[j].Value >>= xIndexAccess;
nContainerIndex = j;
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 707ed86..fbfcba7 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -111,7 +111,7 @@ rtl::OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno::
Sequence< PropertyValue > aPrinterSeq = xPrintable->getPrinter();
for ( int i = 0; i < aPrinterSeq.getLength(); i++ )
{
- if ( aPrinterSeq[i].Name.equalsAscii( "Name" ))
+ if ( aPrinterSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Name" ) ))
{
aPrinterSeq[i].Value >>= aPrinterName;
break;
diff --git a/framework/source/uielement/itemcontainer.cxx b/framework/source/uielement/itemcontainer.cxx
index caa6dc3..9b6c20c 100644
--- a/framework/source/uielement/itemcontainer.cxx
+++ b/framework/source/uielement/itemcontainer.cxx
@@ -82,7 +82,7 @@ ItemContainer::ItemContainer( const Reference< XIndexAccess >& rSourceContainer,
Reference< XIndexAccess > xIndexAccess;
for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ )
{
- if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" ))
+ if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) ))
{
aPropSeq[j].Value >>= xIndexAccess;
nContainerIndex = j;
@@ -118,7 +118,7 @@ void ItemContainer::copyItemContainer( const std::vector< Sequence< PropertyValu
Reference< XIndexAccess > xIndexAccess;
for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ )
{
- if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" ))
+ if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) ))
{
aPropSeq[j].Value >>= xIndexAccess;
nContainerIndex = j;
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 64a01a6..e6510be 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -335,15 +335,15 @@ void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com::
// TODO: Fill menu with the information retrieved by the status update
- if( m_aCommandURL.equalsAscii( ".uno:SetLanguageSelectionMenu" ))
+ if( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:SetLanguageSelectionMenu" ) ))
{
fillPopupMenu(m_xPopupMenu, MODE_SetLanguageSelectionMenu );
}
- else if( m_aCommandURL.equalsAscii( ".uno:SetLanguageParagraphMenu" ))
+ else if( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:SetLanguageParagraphMenu" ) ))
{
fillPopupMenu(m_xPopupMenu, MODE_SetLanguageParagraphMenu );
}
- else if( m_aCommandURL.equalsAscii( ".uno:SetLanguageAllTextMenu" ))
+ else if( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:SetLanguageAllTextMenu" ) ))
{
fillPopupMenu(m_xPopupMenu, MODE_SetLanguageAllTextMenu );
}
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index f139263..77fa03d 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -521,7 +521,7 @@ void NewMenuController::impl_setPopupMenu()
{
for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
{
- if ( aSeq[y].Name.equalsAscii("ooSetupFactoryEmptyDocumentURL") )
+ if ( aSeq[y].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryEmptyDocumentURL")) )
{
aSeq[y].Value >>= m_aEmptyDocURL;
break;
@@ -555,7 +555,7 @@ void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments )
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
m_bShowImages = rSettings.GetUseImagesInMenus();
- m_bNewMenu = m_aCommandURL.equalsAscii( ".uno:AddDirect" );
+ m_bNewMenu = m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:AddDirect" ) );
}
}
}
diff --git a/framework/source/uielement/rootitemcontainer.cxx b/framework/source/uielement/rootitemcontainer.cxx
index 9c65e0c..75a308b 100644
--- a/framework/source/uielement/rootitemcontainer.cxx
+++ b/framework/source/uielement/rootitemcontainer.cxx
@@ -145,7 +145,7 @@ RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceCo
Reference< XIndexAccess > xIndexAccess;
for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ )
{
- if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" ))
+ if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) ))
{
aPropSeq[j].Value >>= xIndexAccess;
nContainerIndex = j;
@@ -182,7 +182,7 @@ void RootItemContainer::copyItemContainer( const std::vector< Sequence< Property
Reference< XIndexAccess > xIndexAccess;
for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ )
{
- if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" ))
+ if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) ))
{
aPropSeq[j].Value >>= xIndexAccess;
nContainerIndex = j;
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 8aeec65..fcf575b 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -270,7 +270,7 @@ rtl::OUString ToolbarsMenuController::getUINameFromCommand( const rtl::OUString&
{
for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
{
- if ( aPropSeq[i].Name.equalsAscii( "Label" ))
+ if ( aPropSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Label" ) ))
{
aPropSeq[i].Value >>= aStr;
break;
@@ -499,18 +499,18 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
}
// Create commands for non-toolbars
- if ( m_aModuleIdentifier.equalsAscii( "com.sun.star.text.TextDocument" ) ||
- m_aModuleIdentifier.equalsAscii( "com.sun.star.text.WebDocument" ) ||
- m_aModuleIdentifier.equalsAscii( "com.sun.star.text.GlobalDocument" ) ||
- m_aModuleIdentifier.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) ||
- m_aModuleIdentifier.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) ||
- m_aModuleIdentifier.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ))
+ if ( m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextDocument" ) ) ||
+ m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.WebDocument" ) ) ||
+ m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.GlobalDocument" ) ) ||
+ m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) ||
+ m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) ||
+ m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ))
{
addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_HYPERLINKBAR )), 10360, aEmptyString );
- if ( m_aModuleIdentifier.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) ||
- m_aModuleIdentifier.equalsAscii( "com.sun.star.presentation.PresentationDocument" ))
+ if ( m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) ||
+ m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ))
addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_COLORBAR )), 10417, aEmptyString );
- else if ( m_aModuleIdentifier.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ))
+ else if ( m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ))
addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_INPUTLINEBAR )), 26241, aEmptyString );
else
addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_FORMULABAR )), 20128, aEmptyString );
diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx
index f4383f4..713449c 100644
--- a/framework/source/uifactory/addonstoolboxfactory.cxx
+++ b/framework/source/uifactory/addonstoolboxfactory.cxx
@@ -177,11 +177,11 @@ throw ( ::com::sun::star::container::NoSuchElementException,
for ( sal_Int32 n = 0; n < Args.getLength(); n++ )
{
- if ( Args[n].Name.equalsAscii( "ConfigurationData" ))
+ if ( Args[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ConfigurationData" ) ))
Args[n].Value >>= aConfigData;
- else if ( Args[n].Name.equalsAscii( "Frame" ))
+ else if ( Args[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Frame" ) ))
Args[n].Value >>= xFrame;
- else if ( Args[n].Name.equalsAscii( "ResourceURL" ))
+ else if ( Args[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ResourceURL" ) ))
Args[n].Value >>= aResourceURL;
}
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx
index 22c6899..cea43a2 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -178,9 +178,9 @@ throw (uno::Exception, uno::RuntimeException)
beans::PropertyValue aPropValue;
if ( Arguments[i] >>= aPropValue )
{
- if ( aPropValue.Name.equalsAscii( "Frame" ))
+ if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Frame" ) ))
aPropValue.Value >>= xFrame;
- else if ( aPropValue.Name.equalsAscii( "ResourceURL" ))
+ else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ResourceURL" ) ))
aPropValue.Value >>= aResourceURL;
}
}
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 6115dbf..df355d5 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -1770,7 +1770,7 @@ void StringResourcePersistenceImpl::implScanLocaleNames( const Sequence< ::rtl::
aExtension = aCompleteName.copy( iDot + 1 );
}
- if( aExtension.equalsAscii( "properties" ) )
+ if( aExtension.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "properties" ) ) )
{
//rtl::OUString aName = aInetObj.getBase();
Locale aLocale;
@@ -1790,7 +1790,7 @@ void StringResourcePersistenceImpl::implScanLocaleNames( const Sequence< ::rtl::
}
}
}
- else if( !bDefaultFound && aExtension.equalsAscii( "default" ) )
+ else if( !bDefaultFound && aExtension.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "default" ) ) )
{
//rtl::OUString aName = aInetObj.getBase();
Locale aLocale;
diff --git a/sfx2/inc/sfx2/XmlIdRegistry.hxx b/sfx2/inc/sfx2/XmlIdRegistry.hxx
index b71b1f4..38090e3 100644
--- a/sfx2/inc/sfx2/XmlIdRegistry.hxx
+++ b/sfx2/inc/sfx2/XmlIdRegistry.hxx
@@ -52,8 +52,8 @@ isValidXmlId(::rtl::OUString const & i_rStreamName,
::rtl::OUString const & i_rIdref)
{
return isValidNCName(i_rIdref) &&
- (i_rStreamName.equalsAscii("content.xml") ||
- i_rStreamName.equalsAscii("styles.xml"));
+ (i_rStreamName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("content.xml")) ||
+ i_rStreamName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("styles.xml")));
}
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 68c45e3..55967a1 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -909,7 +909,7 @@ namespace
{
Reference < XFrame > xFrame( xContainer->getByIndex(i), UNO_QUERY_THROW );
::rtl::OUString sModule = xCheck->identify( xFrame );
- if ( sModule.equalsAscii( "com.sun.star.frame.StartModule" ) )
+ if ( sModule.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.frame.StartModule" ) ) )
return xFrame;
}
catch( const UnknownModuleException& )
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 8ca5f20..8c15a25 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -449,7 +449,7 @@ sal_Bool SfxOfficeDispatch::IsMasterUnoCommand() const
// Determine if URL contains a master/slave command which must be handled a little bit different
sal_Bool SfxOfficeDispatch::IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL )
{
- if ( aURL.Protocol.equalsAscii( ".uno:" ) &&
+ if ( aURL.Protocol.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:" ) ) &&
( aURL.Path.indexOf( '.' ) > 0 ))
return sal_True;
@@ -485,7 +485,7 @@ SfxDispatchController_Impl::SfxDispatchController_Impl(
, bVisible( sal_True )
, pUnoName( pSlot->pUnoName )
{
- if ( aDispatchURL.Protocol.equalsAscii("slot:") && pUnoName )
+ if ( aDispatchURL.Protocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("slot:")) && pUnoName )
{
ByteString aTmp(".uno:");
aTmp += pUnoName;
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index da195fe..d370082 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -117,7 +117,7 @@ static bool lcl_getWindowState( const uno::Reference< container::XNameAccess >&
{
for ( sal_Int32 n = 0; n < aWindowState.getLength(); n++ )
{
- if ( aWindowState[n].Name.equalsAscii( "UIName" ))
+ if ( aWindowState[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UIName" ) ))
{
aWindowState[n].Value >>= rWindowState.sTitle;
}
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 9ab7c21..9b5bdfe 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -532,7 +532,7 @@ void FileDialogHelper_Impl::updateSelectionBox()
Sequence< ::rtl::OUString > aCtrlList = xCtrlInfo->getSupportedControls();
sal_uInt32 nCount = aCtrlList.getLength();
for ( sal_uInt32 nCtrl = 0; nCtrl < nCount; ++nCtrl )
- if ( aCtrlList[ nCtrl ].equalsAscii("SelectionBox") )
+ if ( aCtrlList[ nCtrl ].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SelectionBox")) )
{
bSelectionBoxFound = sal_False;
break;
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index 6b53251..b46cd56 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -129,7 +129,7 @@ static rtl::OUString GetLabelFromCommandURL( const rtl::OUString& rCommandURL, c
{
for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
{
- if ( aPropSeq[i].Name.equalsAscii( "Label" ))
+ if ( aPropSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Label" ) ))
{
aPropSeq[i].Value >>= aLabel;
break;
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 3783eed..e210a7a 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2546,7 +2546,7 @@ IMPL_LINK_INLINE_END( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
{
for( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
{
- if ( aPropSeq[i].Name.equalsAscii( "Label" ))
+ if ( aPropSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Label" ) ))
{
aPropSeq[i].Value >>= sRet;
break;
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index b477a32..aaa74e1 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -250,8 +250,8 @@ static bool isFileNameValid(const ::rtl::OUString & i_rFileName)
const ::rtl::OUString segment(
i_rFileName.getToken(0, static_cast<sal_Unicode> ('/'), idx) );
if (!segment.getLength() || // no empty segments
- segment.equalsAscii(".") || // no . segments
- segment.equalsAscii("..") || // no .. segments
+ segment.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".")) || // no . segments
+ segment.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("..")) || // no .. segments
!::comphelper::OStorageHelper::IsValidZipEntryFileName(
segment, sal_False)) // no invalid characters
return false;
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 2379dd7..8881443 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -543,9 +543,9 @@ getQualifier(const char* i_name) {
DBG_ASSERT(i_qname, "SfxDocumentMetaData: getNameSpace: argument is null");
const char * ns = "";
::rtl::OUString n = getQualifier(i_qname).first;
- if (n.equalsAscii("xlink" )) ns = s_nsXLink;
+ if (n.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("xlink" ) )) ns = s_nsXLink;
if (n.equalsAscii("dc" )) ns = s_nsDC;
- if (n.equalsAscii("office")) ns = s_nsODF;
+ if (n.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office"))) ns = s_nsODF;
if (n.equalsAscii("meta" )) ns = s_nsODFMeta;
DBG_ASSERT(*ns, "SfxDocumentMetaData: unknown namespace prefix");
return ::rtl::OUString::createFromAscii(ns);
@@ -1126,7 +1126,7 @@ void SAL_CALL SfxDocumentMetaData::updateUserDefinedAndAttributes()
static_cast<const char*>("office:target-frame-name"),
m_DefaultTarget));
// xlink:show: _blank -> new, any other value -> replace
- const sal_Char* show = m_DefaultTarget.equalsAscii("_blank")
+ const sal_Char* show = m_DefaultTarget.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("_blank"))
? "new" : "replace";
attributes.push_back(std::make_pair(
static_cast<const char*>("xlink:show"),
@@ -1316,7 +1316,7 @@ void SAL_CALL SfxDocumentMetaData::init(
::rtl::OUString::createFromAscii(s_nsODFMeta),
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value-type")));
::rtl::OUString text = getNodeText(*it);
- if (type.equalsAscii("float")) {
+ if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("float"))) {
double d;
if (::sax::Converter::convertDouble(d, text)) {
any <<= d;
@@ -1325,7 +1325,7 @@ void SAL_CALL SfxDocumentMetaData::init(
OUStringToOString(text, RTL_TEXTENCODING_UTF8).getStr());
continue;
}
- } else if (type.equalsAscii("date")) {
+ } else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("date"))) {
bool isDateTime;
css::util::Date d;
css::util::DateTime dt;
@@ -1340,7 +1340,7 @@ void SAL_CALL SfxDocumentMetaData::init(
OUStringToOString(text, RTL_TEXTENCODING_UTF8).getStr());
continue;
}
- } else if (type.equalsAscii("time")) {
+ } else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("time"))) {
css::util::Duration ud;
if (textToDuration(ud, text)) {
any <<= ud;
@@ -1349,7 +1349,7 @@ void SAL_CALL SfxDocumentMetaData::init(
OUStringToOString(text, RTL_TEXTENCODING_UTF8).getStr());
continue;
}
- } else if (type.equalsAscii("boolean")) {
+ } else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("boolean"))) {
bool b;
if (::sax::Converter::convertBool(b, text)) {
any <<= b;
@@ -1358,7 +1358,7 @@ void SAL_CALL SfxDocumentMetaData::init(
OUStringToOString(text, RTL_TEXTENCODING_UTF8).getStr());
continue;
}
- } else if (type.equalsAscii("string") || true) { // default
+ } else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("string")) || true) { // default
any <<= text;
}
try {
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index cd10edb..b92975e 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -254,7 +254,7 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri
uno::Sequence< beans::PropertyValue > aActuralFilterData;
xFilterFactory->getByName( aActualFilter ) >>= aActuralFilterData;
for ( sal_Int32 nInd = 0; nInd < aActuralFilterData.getLength(); nInd++ )
- if ( aActuralFilterData[nInd].Name.equalsAscii( "Type" ) )
+ if ( aActuralFilterData[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Type" ) ) )
aActuralFilterData[nInd].Value >>= aActualFilterTypeName;
::comphelper::SequenceAsHashMap aProps1( xTypeDetection->getByName( aActualFilterTypeName ) );
uno::Sequence< ::rtl::OUString > aAllExt =
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 7851716..9a82256 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -1870,7 +1870,7 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName,
uno::Sequence< beans::PropertyValue > aFilterData;
xFilterFactory->getByName( aFilterName ) >>= aFilterData;
for ( sal_Int32 nInd = 0; nInd < aFilterData.getLength(); nInd++ )
- if ( aFilterData[nInd].Name.equalsAscii( "Type" ) )
+ if ( aFilterData[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Type" ) ) )
aFilterData[nInd].Value >>= aTypeName;
if ( !aTypeName.getLength() )
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 524c698..d2589e1 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -504,23 +504,23 @@ sal_uInt16 GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl( const ::r
{
sal_uInt16 nResult = 0;
- if ( aFactoryShortName.equalsAscii( "scalc" ) )
+ if ( aFactoryShortName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "scalc" ) ) )
{
nResult = BMP_128X128_CALC_DOC;
}
- else if ( aFactoryShortName.equalsAscii( "sdraw" ) )
+ else if ( aFactoryShortName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "sdraw" ) ) )
{
nResult = BMP_128X128_DRAW_DOC;
}
- else if ( aFactoryShortName.equalsAscii( "simpress" ) )
+ else if ( aFactoryShortName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "simpress" ) ) )
{
nResult = BMP_128X128_IMPRESS_DOC;
}
- else if ( aFactoryShortName.equalsAscii( "smath" ) )
+ else if ( aFactoryShortName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "smath" ) ) )
{
nResult = BMP_128X128_MATH_DOC;
}
- else if ( aFactoryShortName.equalsAscii( "swriter" ) || aFactoryShortName.compareToAscii( "swriter/", 8 ) == 0 )
+ else if ( aFactoryShortName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "swriter" ) ) || aFactoryShortName.compareToAscii( "swriter/", 8 ) == 0 )
{
nResult = BMP_128X128_WRITER_DOC;
}
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index a2a7e07..aa68646 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -141,15 +141,15 @@ static sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode )
static sal_uInt8 getStoreModeFromSlotName( const ::rtl::OUString& aSlotName )
{
sal_uInt8 nResult = 0;
- if ( aSlotName.equalsAscii( "ExportTo" ) )
+ if ( aSlotName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportTo" ) ) )
nResult = EXPORT_REQUESTED;
- else if ( aSlotName.equalsAscii( "ExportToPDF" ) )
+ else if ( aSlotName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportToPDF" ) ) )
nResult = EXPORT_REQUESTED | PDFEXPORT_REQUESTED;
- else if ( aSlotName.equalsAscii( "ExportDirectToPDF" ) )
+ else if ( aSlotName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportDirectToPDF" ) ) )
nResult = EXPORT_REQUESTED | PDFEXPORT_REQUESTED | PDFDIRECTEXPORT_REQUESTED;
- else if ( aSlotName.equalsAscii( "Save" ) )
+ else if ( aSlotName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Save" ) ) )
nResult = SAVE_REQUESTED;
- else if ( aSlotName.equalsAscii( "SaveAs" ) )
+ else if ( aSlotName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SaveAs" ) ) )
nResult = SAVEAS_REQUESTED;
else
throw task::ErrorCodeIOException( ::rtl::OUString(),
@@ -882,11 +882,11 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
pFileDlg = new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aDocServiceName, nDialog, nMust, nDont, rStandardDir, rBlackList );
}
- if( aDocServiceName.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) )
+ if( aDocServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) )
eCtxt = sfx2::FileDialogHelper::SD_EXPORT;
- if( aDocServiceName.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) )
+ if( aDocServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) )
eCtxt = sfx2::FileDialogHelper::SI_EXPORT;
- if( aDocServiceName.equalsAscii( "com.sun.star.text.TextDocument" ) )
+ if( aDocServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextDocument" ) ) )
eCtxt = sfx2::FileDialogHelper::SW_EXPORT;
if ( eCtxt != sfx2::FileDialogHelper::UNKNOWN_CONTEXT )
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 86c46f3..69861e3 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2957,9 +2957,9 @@ sal_Bool SfxObjectShell::IsInformationLost()
::rtl::OUString aPreusedFilterName;
for ( sal_Int32 nInd = 0; nInd < aProps.getLength(); nInd++ )
{
- if ( aProps[nInd].Name.equalsAscii( "FilterName" ) )
+ if ( aProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ) )
aProps[nInd].Value >>= aFilterName;
- else if ( aProps[nInd].Name.equalsAscii( "PreusedFilterName" ) )
+ else if ( aProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PreusedFilterName" ) ) )
aProps[nInd].Value >>= aPreusedFilterName;
}
@@ -3559,7 +3559,7 @@ sal_Bool SfxObjectShell::CopyStoragesOfUnknownMediaType( const uno::Reference< e
default:
{
OSL_ENSURE(
- aSubElements[nInd].equalsAscii( "Configurations2" ) || !xTarget->hasByName( aSubElements[nInd] ),
+ aSubElements[nInd].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Configurations2" ) ) || !xTarget->hasByName( aSubElements[nInd] ),
"The target storage is an output storage, the element should not exist in the target!\n" );
if ( !xTarget->hasByName( aSubElements[nInd] ) )
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index a8a6cb4..cb7c810 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -206,15 +206,15 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL PluginObject::getPropertySetI
void SAL_CALL PluginObject::setPropertyValue(const ::rtl::OUString& aPropertyName, const uno::Any& aAny)
throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- if ( aPropertyName.equalsAscii("PluginURL") )
+ if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PluginURL")) )
{
aAny >>= maURL;
}
- else if ( aPropertyName.equalsAscii("PluginMimeType") )
+ else if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PluginMimeType")) )
{
aAny >>= maMimeType;
}
- else if ( aPropertyName.equalsAscii("PluginCommands") )
+ else if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PluginCommands")) )
{
maCmdList.Clear();
uno::Sequence < beans::PropertyValue > aCommandSequence;
@@ -229,15 +229,15 @@ uno::Any SAL_CALL PluginObject::getPropertyValue(const ::rtl::OUString& aPropert
throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
uno::Any aAny;
- if ( aPropertyName.equalsAscii("PluginURL") )
+ if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PluginURL")) )
{
aAny <<= maURL;
}
- else if ( aPropertyName.equalsAscii("PluginMimeType") )
+ else if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PluginMimeType")) )
{
aAny <<= maMimeType;
}
- else if ( aPropertyName.equalsAscii("PluginCommands") )
+ else if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PluginCommands")) )
{
uno::Sequence< beans::PropertyValue > aCommandSequence;
maCmdList.FillSequence( aCommandSequence );
diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx
index a22671c..2b7c114 100644
--- a/sfx2/source/doc/sfxmodelfactory.cxx
+++ b/sfx2/source/doc/sfxmodelfactory.cxx
@@ -149,9 +149,9 @@ namespace sfx2
{
static bool isSpecialArgumentName( const ::rtl::OUString& _rValueName )
{
- return _rValueName.equalsAscii( "EmbeddedObject" )
- || _rValueName.equalsAscii( "EmbeddedScriptSupport" )
- || _rValueName.equalsAscii( "DocumentRecoverySupport" );
+ return _rValueName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EmbeddedObject" ) )
+ || _rValueName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EmbeddedScriptSupport" ) )
+ || _rValueName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentRecoverySupport" ) );
}
bool operator()( const Any& _rArgument ) const
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index f43cf8e..2149566 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1607,7 +1607,7 @@ SfxPopupWindow* SfxAppToolBoxControl_Impl::CreatePopupWindow()
if ( !pMenu )
{
::framework::MenuConfiguration aConf( m_xServiceManager );
- if ( m_aCommandURL.equalsAscii( ".uno:AddDirect" ))
+ if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:AddDirect" ) ))
pMenu = aConf.CreateBookmarkMenu( m_xFrame, BOOKMARK_NEWMENU );
else
pMenu = aConf.CreateBookmarkMenu( m_xFrame, BOOKMARK_WIZARDMENU );
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index dd9c1b6..62c3957 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -219,7 +219,7 @@ void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const document::EventObject& a
{
SolarMutexGuard aGuard;
- if ( m_pClient && aEvent.EventName.equalsAscii("OnVisAreaChanged") && m_nAspect != embed::Aspects::MSOLE_ICON )
+ if ( m_pClient && aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnVisAreaChanged")) && m_nAspect != embed::Aspects::MSOLE_ICON )
{
m_pClient->ViewChanged();
m_pClient->Invalidate();
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 820b8d6..93a951d 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2579,7 +2579,7 @@ sal_Bool impl_maxOpenDocCountReached()
continue;
// a) do not count the help window
- if (xFrame->getName().equalsAscii("OFFICE_HELP_TASK"))
+ if (xFrame->getName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OFFICE_HELP_TASK")))
continue;
// b) count all other frames
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index a85c3fc..0affb3b 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -129,7 +129,7 @@ static String _getTabString()
Sequence< NamedValue > sMaterial;
if (xHolder->getMaterial() >>= sMaterial) {
for (int i=0; i < sMaterial.getLength(); i++) {
- if ((sMaterial[i].Name.equalsAscii("title")) &&
+ if ((sMaterial[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("title"))) &&
(sMaterial[i].Value >>= aTabString))
{
result += ' ';
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index abca884..ce2093c 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -150,7 +150,7 @@ SfxPrinterController::SfxPrinterController( const Any& i_rComplete,
int nProps = aRenderParms.getLength();
for( int i = 0; i < nProps; i++ )
{
- if( aRenderParms[i].Name.equalsAscii( "ExtraPrintUIOptions" ) )
+ if( aRenderParms[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExtraPrintUIOptions" ) ) )
{
Sequence< beans::PropertyValue > aUIProps;
aRenderParms[i].Value >>= aUIProps;
@@ -749,18 +749,18 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
TransformItems( nId, *rReq.GetArgs(), aProps, GetInterface()->GetSlot(nId) );
for ( sal_Int32 nProp=0; nProp<aProps.getLength(); nProp++ )
{
- if ( aProps[nProp].Name.equalsAscii("Copies") )
+ if ( aProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Copies")) )
aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CopyCount"));
- else if ( aProps[nProp].Name.equalsAscii("RangeText") )
+ else if ( aProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("RangeText")) )
aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pages"));
- if ( aProps[nProp].Name.equalsAscii("Asynchron") )
+ if ( aProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Asynchron")) )
{
aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wait"));
sal_Bool bAsynchron = sal_False;
aProps[nProp].Value >>= bAsynchron;
aProps[nProp].Value <<= (sal_Bool) (!bAsynchron);
}
- if ( aProps[nProp].Name.equalsAscii("Silent") )
+ if ( aProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Silent")) )
{
aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MonitorVisible"));
sal_Bool bPrintSilent = sal_False;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index c47a546..428a5db 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list