summaryrefslogtreecommitdiffstats
path: root/cui
diff options
context:
space:
mode:
authorSzabolcs Dezsi <dezsiszabi@hotmail.com>2012-04-06 14:28:18 +0200
committerJan Holesovsky <kendy@suse.cz>2012-04-06 14:30:05 +0200
commit8a01ee624318ac08800af89d988971114637a04e (patch)
treee4acf35e42ab0c1d0b593bd8970fa2c435f90c95 /cui
parentDo not extern these const char[]'s. (diff)
downloadcore-8a01ee624318ac08800af89d988971114637a04e.tar.gz
core-8a01ee624318ac08800af89d988971114637a04e.zip
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Pattern used: find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\) ) *) *)$/\1\2 ( \3 == \4 )/' \{\} \;
Diffstat (limited to 'cui')
-rw-r--r--cui/source/customize/cfg.cxx24
-rw-r--r--cui/source/customize/selector.cxx6
-rw-r--r--cui/source/options/treeopt.cxx10
3 files changed, 20 insertions, 20 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index a941f4f145d7..cf277504688b 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -418,27 +418,27 @@ OUString GetModuleName( const OUString& aModuleId )
if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextDocument" ) ) ||
aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.GlobalDocument" ) ) )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Writer"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.WebDocument" ) ) )
+ else if ( aModuleId == "com.sun.star.text.WebDocument" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Writer/Web"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) )
+ else if ( aModuleId == "com.sun.star.drawing.DrawingDocument" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Draw"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) )
+ else if ( aModuleId == "com.sun.star.presentation.PresentationDocument" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Impress"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ) )
+ else if ( aModuleId == "com.sun.star.sheet.SpreadsheetDocument" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Calc"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.script.BasicIDE" ) ) )
+ else if ( aModuleId == "com.sun.star.script.BasicIDE" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Basic"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.formula.FormulaProperties" ) ) )
+ else if ( aModuleId == "com.sun.star.formula.FormulaProperties" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Math"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.RelationDesign" ) ) )
+ else if ( aModuleId == "com.sun.star.sdb.RelationDesign" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Relation Design"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.QueryDesign" ) ) )
+ else if ( aModuleId == "com.sun.star.sdb.QueryDesign" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Query Design"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.TableDesign" ) ) )
+ else if ( aModuleId == "com.sun.star.sdb.TableDesign" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Table Design"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.DataSourceBrowser" ) ) )
+ else if ( aModuleId == "com.sun.star.sdb.DataSourceBrowser" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Data Source Browser" ));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.DatabaseDocument" ) ) )
+ else if ( aModuleId == "com.sun.star.sdb.DatabaseDocument" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Database" ));
return ::rtl::OUString();
@@ -463,7 +463,7 @@ OUString GetUIModuleName( const OUString& aModuleId, const uno::Reference< css::
OUString aUIName;
for ( sal_Int32 i = 0; i < aSeq.getLength(); ++i )
{
- if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ooSetupFactoryUIName" ) ))
+ if ( aSeq[i].Name == "ooSetupFactoryUIName" )
{
aSeq[i].Value >>= aModuleUIName;
break;
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 4b6159fdcf60..de928ddc37d1 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -345,12 +345,12 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
// then the user & share are added at depth=1
)
{
- if ( sUIName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "user" ) ) )
+ if ( sUIName == "user" )
{
sUIName = m_sMyMacros;
bIsRootNode = sal_True;
}
- else if ( sUIName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "share" ) ) )
+ else if ( sUIName == "share" )
{
sUIName = m_sProdMacros;
bIsRootNode = sal_True;
@@ -743,7 +743,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected()
{
for ( sal_Int32 k = 0; k < aPropSeq.getLength(); ++k )
{
- if ( aPropSeq[k].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Name" ) ) )
+ if ( aPropSeq[k].Name == "Name" )
{
aPropSeq[k].Value >>= aLabel;
break;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index ed19976d0f79..72a41cef76a8 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1699,7 +1699,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
SfxModule* pSwMod = (*(SfxModule**) GetAppData(SHL_WRITER));
if ( !lcl_isOptionHidden( SID_SW_EDITOPTIONS, aOptionsDlgOpt ) )
{
- if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.WebDocument" ) ) )
+ if ( aFactory == "com.sun.star.text.WebDocument" )
setGroupName( C2U("WriterWeb"), rTextArray.GetString(0) );
else
setGroupName( C2U("Writer"), rTextArray.GetString(0) );
@@ -1740,7 +1740,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
// Calc options
if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) )
{
- if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ))
+ if ( aFactory == "com.sun.star.sheet.SpreadsheetDocument" )
{
if ( !lcl_isOptionHidden( SID_SC_EDITOPTIONS, aOptionsDlgOpt ) )
{
@@ -1767,7 +1767,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
SfxModule* pSdMod = ( *( SfxModule** ) GetAppData( SHL_DRAW ) );
if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) )
{
- if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ))
+ if ( aFactory == "com.sun.star.presentation.PresentationDocument" )
{
if ( !lcl_isOptionHidden( SID_SD_EDITOPTIONS, aOptionsDlgOpt ) )
{
@@ -1791,7 +1791,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
// Draw options
if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) )
{
- if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ))
+ if ( aFactory == "com.sun.star.drawing.DrawingDocument" )
{
if ( !lcl_isOptionHidden( SID_SD_GRAPHIC_OPTIONS, aOptionsDlgOpt ) )
{
@@ -1815,7 +1815,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
// Math options
if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) )
{
- if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.formula.FormulaProperties" ) ))
+ if ( aFactory == "com.sun.star.formula.FormulaProperties" )
{
if ( !lcl_isOptionHidden( SID_SM_EDITOPTIONS, aOptionsDlgOpt ) )
{