[Libreoffice-commits] .: dbaccess/source reportdesign/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Thu Jan 20 02:27:33 PST 2011
dbaccess/source/core/api/KeySet.cxx | 2
dbaccess/source/core/dataaccess/ContentHelper.cxx | 2
dbaccess/source/core/dataaccess/connection.cxx | 2
dbaccess/source/core/dataaccess/databasecontext.cxx | 2
dbaccess/source/core/dataaccess/databasedocument.cxx | 4 -
dbaccess/source/core/dataaccess/documentdefinition.cxx | 10 +--
dbaccess/source/core/dataaccess/intercept.cxx | 2
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 8 +-
dbaccess/source/core/recovery/dbdocrecovery.cxx | 2
dbaccess/source/core/recovery/settingsimport.cxx | 8 +-
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 10 +--
dbaccess/source/ext/macromigration/migrationengine.cxx | 4 -
dbaccess/source/filter/migration/cfgimport.cxx | 28 ++++-----
dbaccess/source/filter/xml/dbloader2.cxx | 2
dbaccess/source/filter/xml/xmlColumn.cxx | 4 -
dbaccess/source/filter/xml/xmlDataSource.cxx | 8 +-
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx | 2
dbaccess/source/filter/xml/xmlExport.cxx | 10 +--
dbaccess/source/filter/xml/xmlQuery.cxx | 2
dbaccess/source/filter/xml/xmlTable.cxx | 4 -
dbaccess/source/ui/app/AppController.cxx | 6 +-
dbaccess/source/ui/browser/sbagrid.cxx | 8 +-
dbaccess/source/ui/control/opendoccontrols.cxx | 2
dbaccess/source/ui/control/toolboxcontroller.cxx | 2
dbaccess/source/ui/misc/WCopyTable.cxx | 4 -
dbaccess/source/ui/misc/dsmeta.cxx | 4 -
reportdesign/source/core/api/ReportDefinition.cxx | 2
reportdesign/source/core/misc/conditionupdater.cxx | 2
reportdesign/source/core/sdr/formatnormalizer.cxx | 8 +-
reportdesign/source/filter/xml/xmlControlProperty.cxx | 2
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 36 ++++++------
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 36 ++++++------
reportdesign/source/filter/xml/xmlfilter.cxx | 8 +-
reportdesign/source/ui/misc/statusbarcontroller.cxx | 8 +-
reportdesign/source/ui/misc/toolboxcontroller.cxx | 16 ++---
reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 2
reportdesign/source/ui/report/ReportController.cxx | 14 ++--
37 files changed, 138 insertions(+), 138 deletions(-)
New commits:
commit 174da50e0ba2dc1733fd2e59254b43e33b03c9b9
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Jan 20 10:27:06 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/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 2bbe611..966ec22 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -324,7 +324,7 @@ void OKeySet::executeStatement(::rtl::OUStringBuffer& io_aFilter,const ::rtl::OU
for(;pAnd != pAndEnd;++pAnd)
{
::rtl::OUString sValue;
- if ( !(pAnd->Value >>= sValue) || !(sValue.equalsAscii("?") || sValue.matchAsciiL(":",1,0)) )
+ if ( !(pAnd->Value >>= sValue) || !(sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("?")) || sValue.matchAsciiL(":",1,0)) )
{ // we have a criteria which has to be taken into account for updates
m_aFilterColumns.push_back(pAnd->Name);
}
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 704fc3c..223895d 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -324,7 +324,7 @@ void SAL_CALL OContentHelper::initialize( const Sequence< Any >& _aArguments ) t
for(;pBegin != pEnd;++pBegin)
{
*pBegin >>= aValue;
- if ( aValue.Name.equalsAscii("Parent") )
+ if ( aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Parent")) )
{
m_xParentContainer.set(aValue.Value,UNO_QUERY);
}
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index b143027..f5fdd75 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -683,7 +683,7 @@ Reference< XInterface > SAL_CALL OConnection::createInstance( const ::rtl::OUStr
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::createInstance" );
Reference< XServiceInfo > xRet;
if ( ( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER == _sServiceSpecifier )
- || ( _sServiceSpecifier.equalsAscii( "com.sun.star.sdb.SingleSelectQueryAnalyzer" ) )
+ || ( _sServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.SingleSelectQueryAnalyzer" ) ) )
)
{
xRet = new OSingleSelectQueryComposer( getTables(),this, m_aContext );
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 42ce480..7b6e9ac 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -407,7 +407,7 @@ void ODatabaseContext::setTransientProperties(const ::rtl::OUString& _sURL, ODat
const PropertyValue* pPropsEnd = rSessionPersistentProps.getConstArray() + rSessionPersistentProps.getLength();
for ( ; pProp != pPropsEnd; ++pProp )
{
- if ( pProp->Name.equalsAscii( "AuthFailedPassword" ) )
+ if ( pProp->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "AuthFailedPassword" ) ) )
{
OSL_VERIFY( pProp->Value >>= sAuthFailedPassword );
}
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index bc31408..669f52d 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1939,7 +1939,7 @@ Reference< XController2 > SAL_CALL ODatabaseDocument::createDefaultViewControlle
Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( const ::rtl::OUString& _ViewName, const Sequence< PropertyValue >& _Arguments, const Reference< XFrame >& _Frame ) throw (IllegalArgumentException, Exception, RuntimeException)
{
- if ( !_ViewName.equalsAscii( "Default" ) && !_ViewName.equalsAscii( "Preview" ) )
+ if ( !_ViewName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Default" ) ) && !_ViewName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Preview" ) ) )
throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
if ( !_Frame.is() )
throw IllegalArgumentException( ::rtl::OUString(), *this, 3 );
@@ -1953,7 +1953,7 @@ Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( cons
::comphelper::NamedValueCollection aInitArgs( _Arguments );
aInitArgs.put( "Frame", _Frame );
- if ( _ViewName.equalsAscii( "Preview" ) )
+ if ( _ViewName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Preview" ) ) )
aInitArgs.put( "Preview", sal_Bool( sal_True ) );
Reference< XInitialization > xInitController( xController, UNO_QUERY_THROW );
xInitController->initialize( aInitArgs.getWrappedPropertyValues() );
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 6c37bff..22cfc09 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -852,7 +852,7 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any& _rOpenArgument, cons
if ( lcl_extractOpenMode( pIter->Value, nOpenMode ) )
continue;
- if ( pIter->Name.equalsAscii( "MacroExecutionMode" ) )
+ if ( pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MacroExecutionMode" ) ) )
{
sal_Int16 nMacroExecMode( !aDocumentMacroMode ? MacroExecMode::USE_CONFIG : *aDocumentMacroMode );
OSL_VERIFY( pIter->Value >>= nMacroExecMode );
@@ -1002,9 +1002,9 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co
{
Any aRet;
- sal_Bool bOpen = aCommand.Name.equalsAscii( "open" );
- sal_Bool bOpenInDesign = aCommand.Name.equalsAscii( "openDesign" );
- sal_Bool bOpenForMail = aCommand.Name.equalsAscii( "openForMail" );
+ sal_Bool bOpen = aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "open" ) );
+ sal_Bool bOpenInDesign = aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "openDesign" ) );
+ sal_Bool bOpenForMail = aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "openForMail" ) );
if ( bOpen || bOpenInDesign || bOpenForMail )
{
// opening the document involves a lot of VCL code, which is not thread-safe, but needs the SolarMutex locked.
@@ -1650,7 +1650,7 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_
sDocumentService = GetDocumentServiceFromMediaType( getContentType(), m_aContext, aClassID );
// check if we are not a form and
// the com.sun.star.report.pentaho.SOReportJobFactory is not present.
- if ( !m_bForm && !sDocumentService.equalsAscii("com.sun.star.text.TextDocument"))
+ if ( !m_bForm && !sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument")))
{
// we seem to be a "new style" report, check if report extension is present.
Reference< XContentEnumerationAccess > xEnumAccess( m_aContext.getLegacyServiceFactory(), UNO_QUERY );
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index 5060200..d00c9e7 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -160,7 +160,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& _URL,const Sequence<PropertyVal
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/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index 9f12bdb..4073cb3 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -177,21 +177,21 @@ void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > &
const beans::PropertyValue* pArgEnd = pArgIter + _aArguments.getLength();
for(;pArgIter != pArgEnd;++pArgIter)
{
- if ( pArgIter->Name.equalsAscii("DataRowSource") )
+ if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataRowSource")) )
{
::com::sun::star::chart::ChartDataRowSource eRowSource = ::com::sun::star::chart::ChartDataRowSource_COLUMNS;
pArgIter->Value >>= eRowSource;
if ( eRowSource != ::com::sun::star::chart::ChartDataRowSource_COLUMNS )
return sal_False;
}
- else if ( pArgIter->Name.equalsAscii("CellRangeRepresentation") )
+ else if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")) )
{
::rtl::OUString sRange;
pArgIter->Value >>= sRange;
- if ( !sRange.equalsAscii("all") )
+ if ( !sRange.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("all")) )
return sal_False;
}
- else if ( pArgIter->Name.equalsAscii("FirstCellAsLabel") )
+ else if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FirstCellAsLabel")) )
{
sal_Bool bFirstCellAsLabel = sal_True;
pArgIter->Value >>= bFirstCellAsLabel;
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index 231f77f..ac29154 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -232,7 +232,7 @@ namespace dbaccess
continue;
// the only section we support so far is "storages"
- if ( !sCurrentSection.equalsAscii( "storages" ) )
+ if ( !sCurrentSection.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "storages" ) ) )
{
bCurrentSectionIsKnownToBeUnsupported = true;
continue;
diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx
index 37abcf3..6d469da 100644
--- a/dbaccess/source/core/recovery/settingsimport.cxx
+++ b/dbaccess/source/core/recovery/settingsimport.cxx
@@ -118,7 +118,7 @@ namespace dbaccess
o_rLocalName = i_rElementName.copy( nSeparatorPos + 1 );
}
- OSL_ENSURE( o_rNamespace.equalsAscii( "config" ), "SettingsImport::split: unexpected namespace!" );
+ OSL_ENSURE( o_rNamespace.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "config" ) ), "SettingsImport::split: unexpected namespace!" );
// our recovery file is kind of hand-made, so there shouldn't be anything else than "config".
// If there is, then just ignore it ...
}
@@ -155,7 +155,7 @@ namespace dbaccess
::rtl::OUString sLocalName;
split( i_rElementName, sNamespace, sLocalName );
- if ( sLocalName.equalsAscii( "config-item-set" ) )
+ if ( sLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "config-item-set" ) ) )
return new ConfigItemSetImport( m_rSettings );
#if OSL_DEBUG_LEVEL > 0
@@ -270,9 +270,9 @@ namespace dbaccess
::rtl::OUString sLocalName;
split( i_rElementName, sNamespace, sLocalName );
- if ( sLocalName.equalsAscii( "config-item-set" ) )
+ if ( sLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "config-item-set" ) ) )
return new ConfigItemSetImport( m_aChildSettings );
- if ( sLocalName.equalsAscii( "config-item" ) )
+ if ( sLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "config-item" ) ) )
return new ConfigItemImport( m_aChildSettings );
#if OSL_DEBUG_LEVEL > 0
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index bb84cce..48732cb 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -335,7 +335,7 @@ namespace dbaccess
if ( m_aStates.empty() )
{
- if ( i_Name.equalsAscii( "office:settings" ) )
+ if ( i_Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "office:settings" ) ) )
{
pNewState = new OfficeSettingsImport( m_aSettings );
}
@@ -496,15 +496,15 @@ namespace dbaccess
switch ( m_eType )
{
case TABLE:
- m_aCompDesc.bForEditing = sModuleIdentifier.equalsAscii( "com.sun.star.sdb.TableDesign" );
+ m_aCompDesc.bForEditing = sModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.TableDesign" ) );
break;
case QUERY:
- m_aCompDesc.bForEditing = sModuleIdentifier.equalsAscii( "com.sun.star.sdb.QueryDesign" );
+ m_aCompDesc.bForEditing = sModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.QueryDesign" ) );
break;
case REPORT:
- if ( sModuleIdentifier.equalsAscii( "com.sun.star.report.ReportDefinition" ) )
+ if ( sModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.report.ReportDefinition" ) ) )
{
// it's an SRB report designer
m_aCompDesc.bForEditing = true;
@@ -517,7 +517,7 @@ namespace dbaccess
break;
default:
- if ( sModuleIdentifier.equalsAscii( "com.sun.star.sdb.RelationDesign" ) )
+ if ( sModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.RelationDesign" ) ) )
{
m_eType = RELATION_DESIGN;
m_aCompDesc.bForEditing = true;
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index c573d03..1a63e8b 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -333,7 +333,7 @@ namespace dbmm
bool bCausedByNewStyleReport =
( _rDocument.eType == eReport )
&& ( aError.isExtractableTo( ::cppu::UnoType< WrongFormatException >::get() ) )
- && ( lcl_getMimeType_nothrow( _rDocument.xCommandProcessor ).equalsAscii( "application/vnd.sun.xml.report" ) );
+ && ( lcl_getMimeType_nothrow( _rDocument.xCommandProcessor ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.sun.xml.report" ) ) );
if ( bCausedByNewStyleReport )
{
@@ -1668,7 +1668,7 @@ namespace dbmm
::rtl::OUString sLocation = xUri->getParameter(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "location" ) ) );
- if ( !sLocation.equalsAscii( "document" ) )
+ if ( !sLocation.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "document" ) ) )
{
// only document libraries must be migrated, of course
return false;
diff --git a/dbaccess/source/filter/migration/cfgimport.cxx b/dbaccess/source/filter/migration/cfgimport.cxx
index ccfc2f6..ed84756 100644
--- a/dbaccess/source/filter/migration/cfgimport.cxx
+++ b/dbaccess/source/filter/migration/cfgimport.cxx
@@ -150,13 +150,13 @@ void SAL_CALL OCfgImport::initialize( const Sequence< Any >& _aArguments ) throw
for(;pIter != pEnd;++pIter)
{
*pIter >>= aValue;
- if ( aValue.Name.equalsAscii("OldConfiguration") && (aValue.Value >>= aOldConfigValues) )
+ if ( aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OldConfiguration")) && (aValue.Value >>= aOldConfigValues) )
{
const NamedValue* configValues = aOldConfigValues.getConstArray();
const NamedValue* configValuesEnd = configValues + aOldConfigValues.getLength();
for(;configValues != configValuesEnd;++configValues)
{
- if ( configValues->Name.equalsAscii("org.openoffice.Office.DataAccess") )
+ if ( configValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("org.openoffice.Office.DataAccess")) )
{
configValues->Value >>= m_xLayer;
break;
@@ -404,7 +404,7 @@ sal_Bool isDocumentReport(const Reference< XMultiServiceFactory >& _xORB,const :
::rtl::OUString aTypeName = xTypeDetection->queryTypeByDescriptor( aMedDescr, sal_True );
const PropertyValue* pIter = aMedDescr.getConstArray();
const PropertyValue* pEnd = pIter + aMedDescr.getLength();
- for( ; pIter != pEnd && !pIter->Name.equalsAscii( "FilterName" ); ++pIter)
+ for( ; pIter != pEnd && !pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ); ++pIter)
;
if ( aTypeName.getLength() && pIter == pEnd )
{
@@ -415,7 +415,7 @@ sal_Bool isDocumentReport(const Reference< XMultiServiceFactory >& _xORB,const :
xNameAccess->getByName(aTypeName) >>= aTypes;
const PropertyValue* types = aTypes.getConstArray();
const PropertyValue* typesEnd = types + aTypes.getLength();
- for( ; types != typesEnd && !types->Name.equalsAscii( "PreferredFilter" ) ; ++types)
+ for( ; types != typesEnd && !types->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PreferredFilter" ) ) ; ++types)
;
if ( types != typesEnd )
{
@@ -441,10 +441,10 @@ sal_Bool isDocumentReport(const Reference< XMultiServiceFactory >& _xORB,const :
::rtl::OUString sScript;
const PropertyValue* events = aEventDesc.getConstArray();
const PropertyValue* eventsEnd = events + aEventDesc.getLength();
- for( ; events != eventsEnd && !events->Name.equalsAscii( "Script" ) ; ++events)
+ for( ; events != eventsEnd && !events->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Script" ) ) ; ++events)
;
if ( events != eventsEnd && (events->Value >>= sScript) )
- bReport = sScript.equalsAscii("service:com.sun.star.wizards.report.CallReportWizard?fill");
+ bReport = sScript.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("service:com.sun.star.wizards.report.CallReportWizard?fill"));
}
}
if ( !bReport )
@@ -641,7 +641,7 @@ void SAL_CALL OCfgImport::addOrReplaceNode(
{
case DATASOURCES:
m_sCurrentDataSourceName = aName;
- if ( m_sCurrentDataSourceName.equalsAscii("Bibliography") )
+ if ( m_sCurrentDataSourceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bibliography")) )
{
Reference< XNameAccess > xDatabaseContext(m_xORB->createInstance(SERVICE_SDB_DATABASECONTEXT), UNO_QUERY);
if ( xDatabaseContext.is() && xDatabaseContext->hasByName(m_sCurrentDataSourceName) )
@@ -693,23 +693,23 @@ void SAL_CALL OCfgImport::addOrReplaceNode(
break;
}
}
- if ( aName.equalsAscii("DataSources") )
+ if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataSources")) )
m_aStack.push(TElementStack::value_type(aName,DATASOURCES));
- else if ( aName.equalsAscii("DataSourceSettings") )
+ else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataSourceSettings")) )
m_aStack.push(TElementStack::value_type(aName,DATASOURCESETTINGS));
- else if ( aName.equalsAscii("Tables") )
+ else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Tables")) )
m_aStack.push(TElementStack::value_type(aName,TABLES));
- else if ( aName.equalsAscii("Queries") )
+ else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Queries")) )
m_aStack.push(TElementStack::value_type(aName,QUERIES));
else if ( aName == CONFIGKEY_DBLINK_BOOKMARKS )
m_aStack.push(TElementStack::value_type(aName,BOOKMARKS));
else if ( aName == CONFIGKEY_SETTINGS )
m_aStack.push(TElementStack::value_type(aName,DATASETTINGS));
- else if ( aName.equalsAscii("Font") )
+ else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Font")) )
m_aStack.push(TElementStack::value_type(aName,DATASETTINGS));
else if ( aName == CONFIGKEY_QRYDESCR_COLUMNS )
m_aStack.push(TElementStack::value_type(aName,COLUMNS));
- else if ( aName.equalsAscii("Font") )
+ else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Font")) )
m_aStack.push(TElementStack::value_type(aName,DATASETTINGS));
}
// -----------------------------------------------------------------------------
@@ -749,7 +749,7 @@ void SAL_CALL OCfgImport::endNode()
}
// register the new datbase document
- if ( !m_sCurrentDataSourceName.equalsAscii("Bibliography") )
+ if ( !m_sCurrentDataSourceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bibliography")) )
{
// create unique name
Reference< XNameAccess > xDatabaseContext(m_xORB->createInstance(SERVICE_SDB_DATABASECONTEXT), UNO_QUERY);
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index ac27b1d..3d71f76 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -349,7 +349,7 @@ namespace
URL aURL;
aURL.Complete = _rURL;
xTransformer->parseStrict( aURL );
- bDoesAllow = aURL.Arguments.equalsAscii( "Interactive" );
+ bDoesAllow = aURL.Arguments.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Interactive" ) );
}
}
catch( const Exception& )
diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx
index 020208c..e2beb26 100644
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@ -92,7 +92,7 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport
m_sHelpMessage = sValue;
break;
case XML_TOK_COLUMN_VISIBILITY:
- m_bHidden = !sValue.equalsAscii("visible");
+ m_bHidden = !sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("visible"));
break;
case XML_TOK_COLUMN_TYPE_NAME:
sType = sValue;
@@ -103,7 +103,7 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport
m_aDefaultValue <<= sValue;
break;
case XML_TOK_COLUMN_VISIBLE:
- m_bHidden = sValue.equalsAscii("false");
+ m_bHidden = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("false"));
break;
case XML_TOK_DEFAULT_CELL_STYLE_NAME:
m_sCellStyleName = sValue;
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx
index cf6dcba..2490e2d 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -146,13 +146,13 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
break;
case XML_TOK_BOOLEAN_COMPARISON_MODE:
aProperty.Name = PROPERTY_BOOLEANCOMPARISONMODE;
- if ( sValue.equalsAscii("equal-integer") )
+ if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-integer")) )
aProperty.Value <<= sal_Int32(0);
- else if ( sValue.equalsAscii("is-boolean") )
+ else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("is-boolean")) )
aProperty.Value <<= sal_Int32(1);
- else if ( sValue.equalsAscii("equal-boolean") )
+ else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-boolean")) )
aProperty.Value <<= sal_Int32(2);
- else if ( sValue.equalsAscii("equal-use-only-zero") )
+ else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-use-only-zero")) )
aProperty.Value <<= sal_Int32(3);
break;
case XML_TOK_USE_CATALOG:
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index cae75bf..480e2f5 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -73,7 +73,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
case XML_TOK_DATA_SOURCE_SETTING_IS_LIST:
- m_bIsList = sValue.equalsAscii("true");
+ m_bIsList = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true"));
break;
case XML_TOK_DATA_SOURCE_SETTING_TYPE:
{
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 5a0ef3a..c43b5a1 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -404,15 +404,15 @@ void ODBExport::exportDataSource()
{
sal_Int32 nValue = 0;
aValue >>= nValue;
- if ( sValue.equalsAscii("0") )
+ if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("0")) )
sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-integer"));
- else if ( sValue.equalsAscii("1") )
+ else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1")) )
sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("is-boolean"));
- else if ( sValue.equalsAscii("2") )
+ else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")) )
sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-boolean"));
- else if ( sValue.equalsAscii("3") )
+ else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("3")) )
sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-use-only-zero"));
- if ( sValue.equalsAscii("equal-integer") )
+ if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-integer")) )
continue;
eToken = XML_BOOLEAN_COMPARISON_MODE;
}
diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx
index 8a02453..903dd78 100644
--- a/dbaccess/source/filter/xml/xmlQuery.cxx
+++ b/dbaccess/source/filter/xml/xmlQuery.cxx
@@ -78,7 +78,7 @@ OXMLQuery::OXMLQuery( ODBFilter& rImport
m_sCommand = sValue;
break;
case XML_TOK_ESCAPE_PROCESSING:
- m_bEscapeProcessing = sValue.equalsAscii("true");
+ m_bEscapeProcessing = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true"));
break;
}
}
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx
index 0f2beb1..1ae9e6d 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -93,10 +93,10 @@ OXMLTable::OXMLTable( ODBFilter& _rImport
m_sStyleName = sValue;
break;
case XML_TOK_APPLY_FILTER:
- m_bApplyFilter = sValue.equalsAscii("true");
+ m_bApplyFilter = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true"));
break;
case XML_TOK_APPLY_ORDER:
- m_bApplyOrder = sValue.equalsAscii("true");
+ m_bApplyOrder = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true"));
break;
}
}
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 40a4fad..40b46f2 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -1119,7 +1119,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
const PropertyValue* pEnd = pIter + aArgs.getLength();
for( ; pIter != pEnd ; ++pIter)
{
- if ( pIter->Name.equalsAscii("FormatStringId") )
+ if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FormatStringId")) )
{
SotFormatStringId nFormatId = 0;
if ( pIter->Value >>= nFormatId )
@@ -2850,7 +2850,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
const NamedValue* pEnd = pIter + aCurrentSelection.getLength();
for(;pIter != pEnd;++pIter)
{
- if ( pIter->Name.equalsAscii("Type") )
+ if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Type")) )
{
sal_Int32 nType = 0;
pIter->Value >>= nType;
@@ -2858,7 +2858,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
throw IllegalArgumentException();
eType = static_cast< ElementType >( nType );
}
- else if ( pIter->Name.equalsAscii("Selection") )
+ else if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Selection")) )
pIter->Value >>= aSelection;
}
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 8fdc689..e09f224 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -460,13 +460,13 @@ IMPL_LINK( SbaXGridPeer, OnDispatchEvent, void*, /*NOTINTERESTEDIN*/ )
SbaXGridPeer::DispatchType SbaXGridPeer::classifyDispatchURL( const URL& _rURL )
{
DispatchType eURLType = dtUnknown;
- if ( _rURL.Complete.equalsAscii( ".uno:GridSlots/BrowserAttribs" ) )
+ if ( _rURL.Complete.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GridSlots/BrowserAttribs" ) ) )
eURLType = dtBrowserAttribs;
- else if ( _rURL.Complete.equalsAscii( ".uno:GridSlots/RowHeight" ) )
+ else if ( _rURL.Complete.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GridSlots/RowHeight" ) ) )
eURLType = dtRowHeight;
- else if ( _rURL.Complete.equalsAscii( ".uno:GridSlots/ColumnAttribs" ) )
+ else if ( _rURL.Complete.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GridSlots/ColumnAttribs" ) ) )
eURLType = dtColumnAttribs;
- else if ( _rURL.Complete.equalsAscii( ".uno:GridSlots/ColumnWidth" ) )
+ else if ( _rURL.Complete.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GridSlots/ColumnWidth" ) ) )
eURLType = dtColumnWidth;
return eURLType;
}
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index 447710e..f8c03ee 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -106,7 +106,7 @@ namespace dbaui
for ( sal_Int32 i=0; i<nCount; ++i )
{
::rtl::OUString sPropertyName( aProperties[i].Name );
- if ( sPropertyName.equalsAscii("Label" ) )
+ if ( sPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Label" ) ) )
{
aProperties[i].Value >>= sLabel;
break;
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 78632ef..685faf3 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -115,7 +115,7 @@ namespace dbaui
SolarMutexGuard aSolarMutexGuard;
::osl::MutexGuard aGuard(m_aMutex);
- if ( m_aCommandURL.equalsAscii(".uno:DBNewForm") )
+ if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:DBNewForm")) )
{
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewForm")) ,sal_True));
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewView")) ,sal_True));
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index bf8eab4..242d27b 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -152,7 +152,7 @@ bool ObjectCopySource::isView() const
{
::rtl::OUString sObjectType;
OSL_VERIFY( m_xObject->getPropertyValue( PROPERTY_TYPE ) >>= sObjectType );
- bIsView = sObjectType.equalsAscii( "VIEW" );
+ bIsView = sObjectType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VIEW" ) );
}
}
catch( const Exception& )
@@ -330,7 +330,7 @@ bool NamedTableCopySource::isView() const
{
DBG_UNHANDLED_EXCEPTION();
}
- return sTableType.equalsAscii( "VIEW" );
+ return sTableType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VIEW" ) );
}
//------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx
index f65d3c0..a7c3def 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -151,9 +151,9 @@ namespace dbaui
{
::rtl::OUString sAuth;
aMetaData.get("Authentication") >>= sAuth;
- if ( sAuth.equalsAscii("UserPassword") )
+ if ( sAuth.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserPassword")) )
aInit = AuthUserPwd;
- else if ( sAuth.equalsAscii("Password") )
+ else if ( sAuth.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Password")) )
aInit = AuthPwd;
}
s_aSupport.insert(Supported::value_type(*pIter,aInit));
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 2bb1007..bb70d69 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -2232,7 +2232,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstanceWith
{
beans::NamedValue aValue;
*pIter >>= aValue;
- if( aValue.Name.equalsAscii( "Storage" ) )
+ if( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Storage" ) ) )
aValue.Value >>= xStorage;
}
m_pImpl->m_pObjectContainer->SwitchPersistence(xStorage);
diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx
index 8d7fcd2..5907b01 100644
--- a/reportdesign/source/core/misc/conditionupdater.cxx
+++ b/reportdesign/source/core/misc/conditionupdater.cxx
@@ -70,7 +70,7 @@ namespace rptui
return;
Reference< XReportControlModel > xRptControlModel( _rEvent.Source, UNO_QUERY );
- if ( xRptControlModel.is() && _rEvent.PropertyName.equalsAscii( "DataField" ) )
+ if ( xRptControlModel.is() && _rEvent.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DataField" ) ) )
{
::rtl::OUString sOldDataSource, sNewDataSource;
OSL_VERIFY( _rEvent.OldValue >>= sOldDataSource );
diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx
index af47572..088ce7f 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.cxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.cxx
@@ -127,9 +127,9 @@ namespace rptui
//--------------------------------------------------------------------
void FormatNormalizer::impl_onDefinitionPropertyChange( const ::rtl::OUString& _rChangedPropName )
{
- if ( !_rChangedPropName.equalsAscii( "Command" )
- && !_rChangedPropName.equalsAscii( "CommandType" )
- && !_rChangedPropName.equalsAscii( "EscapeProcessing" )
+ if ( !_rChangedPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Command" ) )
+ && !_rChangedPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CommandType" ) )
+ && !_rChangedPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EscapeProcessing" ) )
)
// nothing we're interested in
return;
@@ -139,7 +139,7 @@ namespace rptui
//--------------------------------------------------------------------
void FormatNormalizer::impl_onFormattedProperttyChange( const Reference< XFormattedField >& _rxFormatted, const ::rtl::OUString& _rChangedPropName )
{
- if ( !_rChangedPropName.equalsAscii( "DataField" ) )
+ if ( !_rChangedPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DataField" ) ) )
// nothing we're interested in
return;
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index f2d039d..bc3726d 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -82,7 +82,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
case XML_TOK_LIST_PROPERTY:
- m_bIsList = sValue.equalsAscii("true");
+ m_bIsList = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true"));
break;
case XML_TOK_VALUE_TYPE:
{
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index c6012ea..4a5fd58 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -159,7 +159,7 @@ void SAL_CALL ExportDocumentHandler::endDocument() throw (uno::RuntimeException,
void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs) throw (uno::RuntimeException, xml::sax::SAXException)
{
bool bExport = true;
- if ( _sName.equalsAscii("office:chart") )
+ if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:chart")) )
{
SvXMLAttributeList* pList = new SvXMLAttributeList();
uno::Reference< xml::sax::XAttributeList > xNewAttribs = pList;
@@ -202,20 +202,20 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
m_xDelegatee->endElement(sTableCalc);
bExport = false;
}
- else if ( _sName.equalsAscii("table:table") )
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table")) )
{
m_xDelegatee->startElement(lcl_createAttribute(XML_NP_RPT,XML_DETAIL),NULL);
lcl_exportPrettyPrinting(m_xDelegatee);
}
- else if ( _sName.equalsAscii("table:table-header-rows") )
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-header-rows")) )
{
m_bCountColumnHeader = true;
}
- else if ( m_bCountColumnHeader && _sName.equalsAscii("table:table-cell") )
+ else if ( m_bCountColumnHeader && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell")) )
{
++m_nColumnCount;
}
- else if ( _sName.equalsAscii("table:table-rows") )
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-rows")) )
{
m_xDelegatee->startElement(_sName,xAttribs);
exportTableRows();
@@ -223,30 +223,30 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
m_bTableRowsStarted = true;
m_bFirstRowExported = true;
}
- else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAscii("table:table-row") || _sName.equalsAscii("table:table-cell")) )
+ else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-row")) || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell"))) )
bExport = false;
- else if ( _sName.equalsAscii("chart:plot-area"))
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:plot-area")))
{
SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs);
pList->RemoveAttribute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("table:cell-range-address")));
}
- else if ( _sName.equalsAscii("chart:categories"))
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:categories")))
{
static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_TABLE,XML_CELL_RANGE_ADDRESS));
lcl_correctCellAddress(s_sCellAddress,xAttribs);
}
- else if ( _sName.equalsAscii("chart:series"))
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:series")))
{
static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_CHART,XML_VALUES_CELL_RANGE_ADDRESS));
lcl_correctCellAddress(s_sCellAddress,xAttribs);
}
- else if ( m_bTableRowsStarted && !m_bFirstRowExported && _sName.equalsAscii("table:table-cell") )
+ else if ( m_bTableRowsStarted && !m_bFirstRowExported && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell")) )
{
SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs);
static ::rtl::OUString s_sValue(lcl_createAttribute(XML_NP_OFFICE,XML_VALUE));
pList->RemoveAttribute(s_sValue);
}
- else if ( m_bTableRowsStarted && _sName.equalsAscii("text:p") )
+ else if ( m_bTableRowsStarted && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text:p")) )
{
bExport = false;
}
@@ -258,27 +258,27 @@ void SAL_CALL ExportDocumentHandler::endElement(const ::rtl::OUString & _sName)
{
bool bExport = true;
::rtl::OUString sNewName = _sName;
- if ( _sName.equalsAscii("office:chart") )
+ if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:chart")) )
{
sNewName = lcl_createAttribute(XML_NP_OFFICE,XML_REPORT);
}
- else if ( _sName.equalsAscii("table:table") )
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table")) )
{
m_xDelegatee->endElement(_sName);
lcl_exportPrettyPrinting(m_xDelegatee);
sNewName = lcl_createAttribute(XML_NP_RPT,XML_DETAIL);
}
- else if ( _sName.equalsAscii("table:table-header-rows") )
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-header-rows")) )
{
m_bCountColumnHeader = false;
}
- else if ( _sName.equalsAscii("table:table-rows") )
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-rows")) )
m_bTableRowsStarted = false;
- else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAscii("table:table-row") || _sName.equalsAscii("table:table-cell")) )
+ else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-row")) || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell"))) )
bExport = false;
- else if ( m_bTableRowsStarted && _sName.equalsAscii("table:table-row") )
+ else if ( m_bTableRowsStarted && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-row")) )
m_bFirstRowExported = true;
- else if ( m_bTableRowsStarted && _sName.equalsAscii("text:p") )
+ else if ( m_bTableRowsStarted && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text:p")) )
{
bExport = !m_bFirstRowExported;
}
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index 0b30051..af642e5 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -149,7 +149,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
{
uno::Reference< xml::sax::XAttributeList > xNewAttribs = _xAttrList;
bool bExport = true;
- if ( _sName.equalsAscii("office:report") )
+ if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:report")) )
{
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
@@ -197,7 +197,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
bExport = false;
m_bImportedChart = true;
}
- else if ( _sName.equalsAscii("rpt:master-detail-field") )
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:master-detail-field")) )
{
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
@@ -237,13 +237,13 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
}
bExport = false;
}
- else if ( _sName.equalsAscii("rpt:detail")
- || _sName.equalsAscii("rpt:formatted-text")
- || _sName.equalsAscii("rpt:master-detail-fields")
- || _sName.equalsAscii("rpt:report-component")
- || _sName.equalsAscii("rpt:report-element"))
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:detail"))
+ || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:formatted-text"))
+ || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:master-detail-fields"))
+ || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:report-component"))
+ || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:report-element")))
bExport = false;
- else if ( _sName.equalsAscii("chart:plot-area"))
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:plot-area")))
{
sal_Bool bHasCategories = sal_True;
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
@@ -257,10 +257,10 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
sLocalName = sAttrName;
else
sLocalName = sAttrName.copy( nColonPos + 1L );
- if ( sLocalName.equalsAscii("data-source-has-labels") )
+ if ( sLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("data-source-has-labels")) )
{
const rtl::OUString sValue = _xAttrList->getValueByIndex( i );
- bHasCategories = sValue.equalsAscii("both");
+ bHasCategories = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("both"));
break;
}
}
@@ -268,7 +268,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
beans::PropertyValue* pArgEnd = pArgIter + m_aArguments.getLength();
for(;pArgIter != pArgEnd;++pArgIter)
{
- if ( pArgIter->Name.equalsAscii("HasCategories") )
+ if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HasCategories")) )
{
pArgIter->Value <<= bHasCategories;
break;
@@ -290,11 +290,11 @@ void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName)
{
bool bExport = true;
::rtl::OUString sNewName = _sName;
- if ( _sName.equalsAscii("office:report") )
+ if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:report")) )
{
sNewName = lcl_createAttribute(XML_NP_OFFICE,XML_CHART);
}
- else if ( _sName.equalsAscii("rpt:master-detail-fields") )
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:master-detail-fields")) )
{
if ( !m_aMasterFields.empty() )
m_xDatabaseDataProvider->setMasterFields(uno::Sequence< ::rtl::OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size()));
@@ -302,11 +302,11 @@ void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName)
m_xDatabaseDataProvider->setDetailFields(uno::Sequence< ::rtl::OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size()));
bExport = false;
}
- else if ( _sName.equalsAscii("rpt:detail")
- || _sName.equalsAscii("rpt:formatted-text")
- || _sName.equalsAscii("rpt:master-detail-field")
- || _sName.equalsAscii("rpt:report-component")
- || _sName.equalsAscii("rpt:report-element"))
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:detail"))
+ || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:formatted-text"))
+ || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:master-detail-field"))
+ || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:report-component"))
+ || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:report-element")))
bExport = false;
if ( bExport )
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index c9236d9..721e025 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -482,11 +482,11 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
const PropertyValue* pEnd = pIter + rDescriptor.getLength();
for(;pIter != pEnd;++pIter)
{
- if( pIter->Name.equalsAscii( "FileName" ) )
+ if( pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FileName" ) ) )
pIter->Value >>= sFileName;
- else if( pIter->Name.equalsAscii( "Storage" ) )
+ else if( pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Storage" ) ) )
pIter->Value >>= xStorage;
- else if( pIter->Name.equalsAscii( "ComponentData" ) )
+ else if( pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ComponentData" ) ) )
{
Sequence< PropertyValue > aComponent;
pIter->Value >>= aComponent;
@@ -494,7 +494,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
const PropertyValue* pComponentEnd = pComponentIter + aComponent.getLength();
for(;pComponentIter != pComponentEnd;++pComponentIter)
{
- if( pComponentIter->Name.equalsAscii( "ActiveConnection" ) )
+ if( pComponentIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ActiveConnection" ) ) )
{
uno::Reference<sdbc::XConnection> xCon(pComponentIter->Value,uno::UNO_QUERY);
xNumberFormatsSupplier = ::dbtools::getNumberFormats(xCon);
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index f6c26ac..2e863fc 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -110,11 +110,11 @@ void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArgumen
break;
}
}
- if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") )
+ if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ZoomSlider")) )
{
m_pController = TStatusbarHelper::createFromQuery(new SvxZoomSliderControl(m_nSlotId = SID_ATTR_ZOOMSLIDER,m_nId,*pStatusBar));
}
- else if ( m_aCommandURL.equalsAscii(".uno:Zoom") )
+ else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Zoom")) )
{
m_pController = TStatusbarHelper::createFromQuery(new SvxZoomStatusBarControl(m_nSlotId = SID_ATTR_ZOOM,m_nId,*pStatusBar));
}
@@ -137,7 +137,7 @@ void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEv
if ( m_pController.is() )
{
- if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") )
+ if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ZoomSlider")) )
{
Sequence< PropertyValue > aSeq;
if ( (_aEvent.State >>= aSeq) && aSeq.getLength() == 2 )
@@ -147,7 +147,7 @@ void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEv
static_cast<SvxZoomSliderControl*>(m_pController.get())->StateChanged(m_nSlotId,SFX_ITEM_AVAILABLE,&aZoomSlider);
}
}
- else if ( m_aCommandURL.equalsAscii(".uno:Zoom") )
+ else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Zoom")) )
{
Sequence< PropertyValue > aSeq;
if ( (_aEvent.State >>= aSeq) && aSeq.getLength() == 3 )
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index 3bc4d18..135c4d0 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -159,42 +159,42 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments
break;
}
}
- if ( m_aCommandURL.equalsAscii(".uno:BasicShapes") )
+ if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:BasicShapes")) )
{
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:BasicShapes")),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_BASIC,m_nToolBoxId,*pToolBox));
}
- else if ( m_aCommandURL.equalsAscii(".uno:SymbolShapes") )
+ else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:SymbolShapes")) )
{
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SymbolShapes")),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_SYMBOL,m_nToolBoxId,*pToolBox));
}
- else if ( m_aCommandURL.equalsAscii(".uno:ArrowShapes") )
+ else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ArrowShapes")) )
{
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:ArrowShapes")),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_ARROW,m_nToolBoxId,*pToolBox));
}
- else if ( m_aCommandURL.equalsAscii(".uno:FlowChartShapes") )
+ else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:FlowChartShapes")) )
{
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FlowChartShapes")),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_FLOWCHART,m_nToolBoxId,*pToolBox));
}
- else if ( m_aCommandURL.equalsAscii(".uno:CalloutShapes") )
+ else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CalloutShapes")) )
{
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CalloutShapes")),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_CALLOUT,m_nToolBoxId,*pToolBox));
}
- else if ( m_aCommandURL.equalsAscii(".uno:StarShapes") )
+ else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:StarShapes")) )
{
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:StarShapes")),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_STAR,m_nToolBoxId,*pToolBox));
}
- else if ( m_aCommandURL.equalsAscii(".uno:CharFontName") )
+ else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CharFontName")) )
{
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CharFontName")),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxFontNameToolBoxControl/*SvxStyleToolBoxControl*/(m_nSlotId = SID_ATTR_CHAR_FONT,m_nToolBoxId,*pToolBox));
}
- else if ( m_aCommandURL.equalsAscii(".uno:FontColor") || m_aCommandURL.equalsAscii(".uno:Color") )
+ else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:FontColor")) || m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Color")) )
{
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FontColor")),sal_True));
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Color")),sal_True));
diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
index 763da5e..61eed84 100644
--- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
+++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
@@ -150,7 +150,7 @@ namespace rptui
// -----------------------------------------------------------------------------
void FormattedFieldBeautifier::notifyPropertyChange( const beans::PropertyChangeEvent& _rEvent )
{
- if ( !_rEvent.PropertyName.equalsAscii( "DataField" ) )
+ if ( !_rEvent.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DataField" ) ) )
// not interested in
return;
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 9beed73..0c4f5e0 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1641,7 +1641,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
{
openZoomDialog();
}
- else if ( aArgs.getLength() == 1 && aArgs[0].Name.equalsAscii("Zoom") )
+ else if ( aArgs.getLength() == 1 && aArgs[0].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Zoom")) )
{
SvxZoomItem aZoomItem;
aZoomItem.PutValue(aArgs[0].Value);
@@ -1651,7 +1651,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
}
break;
case SID_ATTR_ZOOMSLIDER:
- if ( aArgs.getLength() == 1 && aArgs[0].Name.equalsAscii("ZoomSlider") )
+ if ( aArgs.getLength() == 1 && aArgs[0].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ZoomSlider")) )
{
SvxZoomSliderItem aZoomSlider;
aZoomSlider.PutValue(aArgs[0].Value);
@@ -2791,7 +2791,7 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& Data) throw( un
const beans::PropertyValue* pPropsEnd = pPropsIter + aProps.getLength();
for (sal_Int32 i = 0; pPropsIter != pPropsEnd; ++pPropsIter,++i)
{
- if ( pPropsIter->Name.equalsAscii("CommandProperties") )
+ if ( pPropsIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CommandProperties")) )
{
util::URL aCommand;
uno::Sequence< beans::PropertyValue> aArgs(1);
@@ -2813,11 +2813,11 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& Data) throw( un
}
}
}
- else if ( pPropsIter->Name.equalsAscii("CollapsedSections") )
+ else if ( pPropsIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CollapsedSections")) )
pPropsIter->Value >>= m_aCollapsedSections;
- else if ( pPropsIter->Name.equalsAscii("MarkedSection") )
+ else if ( pPropsIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MarkedSection")) )
pPropsIter->Value >>= m_nPageNum;
- else if ( pPropsIter->Name.equalsAscii("ZoomFactor") )
+ else if ( pPropsIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ZoomFactor")) )
pPropsIter->Value >>= m_nZoomValue;
}
}
@@ -4081,7 +4081,7 @@ void SAL_CALL OReportController::setMode( const ::rtl::OUString& aMode ) throw (
// -----------------------------------------------------------------------------
bool OReportController::isUiVisible() const
{
- return !m_sMode.equalsAscii("remote");
+ return !m_sMode.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("remote"));
}
// -----------------------------------------------------------------------------
void OReportController::impl_fillState_nothrow(const ::rtl::OUString& _sProperty,dbaui::FeatureState& _rState) const
More information about the Libreoffice-commits
mailing list