strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

equalsAsciiL faster than equalsAscii & comparetoAscii(const sal_Char*)

Browse source
This commit is contained in:
Caolán McNamara 2011-01-16 14:12:57 +00:00
parent b1b10adec4
commit 6d7536ce4e
14 changed files with 163 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
basic/source/basmgr/basmgr.cxx
View file

@ -953,7 +953,7 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
{
Any aLibAny = xScriptCont->getByName( *pScriptLibName );
if ( pScriptLibName->equalsAscii( "Standard" ) )
if ( pScriptLibName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Standard")) )
xScriptCont->loadLibrary( *pScriptLibName );
BasMgrContainerListenerImpl::insertLibraryImpl

24
framework/source/accelerators/acceleratorconfiguration.cxx
View file

@ -1190,14 +1190,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
{
css::uno::Reference< css::container::XNamed > xNamed(m_xCfg, css::uno::UNO_QUERY);
::rtl::OUString sConfig = xNamed->getName();
if ( sConfig.equalsAscii("Global") )
if ( sConfig.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Global")) )
{
m_xCfg = css::uno::Reference< css::container::XNameAccess > (
::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_GLOBAL, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
css::uno::UNO_QUERY );
XCUBasedAcceleratorConfiguration::reload();
}
else if ( sConfig.equalsAscii("Modules") )
else if ( sConfig.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Modules")) )
{
m_xCfg = css::uno::Reference< css::container::XNameAccess > (
::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_MODULES, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
@ -1283,9 +1283,9 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
{
AcceleratorCache aReadCache = AcceleratorCache();
css::uno::Reference< css::container::XNameAccess > xAccess;
if (m_sGlobalOrModules.equalsAscii("Global"))
if (m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Global")))
xCfg->getByName(CFG_ENTRY_GLOBAL) >>= xAccess;
else if (m_sGlobalOrModules.equalsAscii("Modules"))
else if (m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Modules")))
{
css::uno::Reference< css::container::XNameAccess > xModules;
xCfg->getByName(CFG_ENTRY_MODULES) >>= xModules;
@ -1362,13 +1362,13 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
break;
}
if (sToken[k].equalsAscii("SHIFT"))
if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SHIFT")))
aKeyEvent.Modifiers |= css::awt::KeyModifier::SHIFT;
else if (sToken[k].equalsAscii("MOD1"))
else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD1")))
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD1;
else if (sToken[k].equalsAscii("MOD2"))
else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD2")))
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD2;
else if (sToken[k].equalsAscii("MOD3"))
else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD3")))
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3;
else
{
@ -1587,13 +1587,13 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
break;
sToken[i] = sKey.getToken(0, '_', nIndex);
if (sToken[i].equalsAscii("SHIFT"))
if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SHIFT")))
aKeyEvent.Modifiers |= css::awt::KeyModifier::SHIFT;
else if (sToken[i].equalsAscii("MOD1"))
else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD1")))
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD1;
else if (sToken[i].equalsAscii("MOD2"))
else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD2")))
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD2;
else if (sToken[i].equalsAscii("MOD3"))
else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD3")))
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3;
}

6
framework/source/dispatch/dispatchprovider.cxx
View file

@ -477,8 +477,8 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
{
// There exist a hard coded interception for special URLs.
if (
(aURL.Complete.equalsAscii(".uno:CloseDoc" )) ||
(aURL.Complete.equalsAscii(".uno:CloseWin" ))
(aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CloseDoc"))) ||
(aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CloseWin")))
)
{
css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY );
@ -494,7 +494,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
else
xDispatcher = implts_getOrCreateDispatchHelper( E_CLOSEDISPATCHER, xFrame );
}
else if (aURL.Complete.equalsAscii(".uno:CloseFrame"))
else if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CloseFrame")))
xDispatcher = implts_getOrCreateDispatchHelper( E_CLOSEDISPATCHER, xFrame );
if ( ! xDispatcher.is())

30
framework/source/helper/titlebarupdate.cxx
View file

@ -231,27 +231,27 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
rtl::OUString aModuleId = xModuleManager->identify(xFrame);
rtl::OUString sDesktopName;
if ( aModuleId.equalsAscii( "com.sun.star.text.TextDocument" ) ||
aModuleId.equalsAscii( "com.sun.star.text.GlobalDocument" ) ||
aModuleId.equalsAscii( "com.sun.star.text.WebDocument" ) ||
aModuleId.equalsAscii( "com.sun.star.xforms.XMLFormDocument" ) )
if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.GlobalDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.xforms.XMLFormDocument")) )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("writer"));
else if ( aModuleId.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ) )
else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sheet.SpreadsheetDocument")) )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("calc"));
else if ( aModuleId.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) )
else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationDocument")) )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("impress"));
else if ( aModuleId.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) )
else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocument")) )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("draw"));
else if ( aModuleId.equalsAscii( "com.sun.star.formula.FormulaProperties" ) )
else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.formula.FormulaProperties")) )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("math"));
else if ( aModuleId.equalsAscii( "com.sun.star.sdb.DatabaseDocument" ) ||
aModuleId.equalsAscii( "com.sun.star.sdb.OfficeDatabaseDocument" ) ||
aModuleId.equalsAscii( "com.sun.star.sdb.RelationDesign" ) ||
aModuleId.equalsAscii( "com.sun.star.sdb.QueryDesign" ) ||
aModuleId.equalsAscii( "com.sun.star.sdb.TableDesign" ) ||
aModuleId.equalsAscii( "com.sun.star.sdb.DataSourceBrowser" ) )
else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DatabaseDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.RelationDesign")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.QueryDesign")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.TableDesign")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DataSourceBrowser")) )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("base"));
else if ( aModuleId.equalsAscii( "com.sun.star.frame.StartModule" ) )
else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.frame.StartModule")) )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("startcenter"));
else
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("startcenter"));

18
framework/source/layoutmanager/layoutmanager.cxx
View file

@ -844,9 +844,9 @@ void LayoutManager::implts_createCustomToolBars(
::rtl::OUString aTbxTitle;
for ( sal_Int32 j = 0; j < rTbxSeq.getLength(); j++ )
{
if ( rTbxSeq[j].Name.equalsAscii( "ResourceURL" ))
if ( rTbxSeq[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ResourceURL")) )
rTbxSeq[j].Value >>= aTbxResName;
else if ( rTbxSeq[j].Name.equalsAscii( "UIName" ))
else if ( rTbxSeq[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UIName")) )
rTbxSeq[j].Value >>= aTbxTitle;
}
@ -1332,7 +1332,7 @@ void LayoutManager::implts_refreshContextToolbarsVisibility()
UIElementVector::iterator pIter;
for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
{
if ( pIter->m_aType.equalsAsciiL( "toolbar", 7 ))
if ( pIter->m_aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("toolbar")) )
{
aUIElementVisible.aName = pIter->m_aName;
aUIElementVisible.bVisible = pIter->m_bVisible;
@ -1449,22 +1449,22 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName,
if ( aWindowState[n].Value >>= bValue )
rElementData.m_aDockedData.m_bLocked = bValue;
}
else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_CONTEXT ))
else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_CONTEXT)))
{
if ( aWindowState[n].Value >>= bValue )
rElementData.m_bContextSensitive = bValue;
}
else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_NOCLOSE ))
else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_NOCLOSE)))
{
if ( aWindowState[n].Value >>= bValue )
rElementData.m_bNoClose = bValue;
}
else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_CONTEXTACTIVE ))
else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_CONTEXTACTIVE)))
{
if ( aWindowState[n].Value >>= bValue )
rElementData.m_bContextActive = bValue;
}
else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_SOFTCLOSE ))
else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_SOFTCLOSE)))
{
if ( aWindowState[n].Value >>= bValue )
rElementData.m_bSoftClose = bValue;
@ -4022,7 +4022,7 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent )
for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
{
if ( pIter->m_aType.equalsAscii( "toolbar" ) &&
if ( pIter->m_aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("toolbar")) &&
pIter->m_xUIElement.is() )
{
css::uno::Reference< css::ui::XUIFunctionListener > xListener( pIter->m_xUIElement, UNO_QUERY );
@ -4945,7 +4945,7 @@ throw (RuntimeException)
UIElementVector::iterator pIter;
for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
{
if ( pIter->m_aType.equalsAscii( "toolbar" ) &&
if ( pIter->m_aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("toolbar")) &&
pIter->m_xUIElement.is() &&
pIter->m_bFloating &&
pIter->m_bVisible )

6
framework/source/uiconfiguration/imagemanagerimpl.cxx
View file

@ -786,15 +786,15 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments )
PropertyValue aPropValue;
if ( aArguments[n] >>= aPropValue )
{
if ( aPropValue.Name.equalsAscii( "UserConfigStorage" ))
if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserConfigStorage")) )
{
aPropValue.Value >>= m_xUserConfigStorage;
}
else if ( aPropValue.Name.equalsAscii( "ModuleIdentifier" ))
else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ModuleIdentifier")) )
{
aPropValue.Value >>= m_aModuleIdentifier;
}
else if ( aPropValue.Name.equalsAscii( "UserRootCommit" ))
else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserRootCommit")) )
{
aPropValue.Value >>= m_xUserRootCommit;
}

2
framework/source/uielement/menubarwrapper.cxx
View file

@ -196,7 +196,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
PropertyValue aPropValue;
if ( aArguments[n] >>= aPropValue )
{
if ( aPropValue.Name.equalsAscii( "MenuOnly" ))
if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MenuOnly")) )
aPropValue.Value >>= bMenuOnly;
}
}

47
framework/source/uielement/toolbarmanager.cxx
View file

@ -123,19 +123,18 @@ static const char ITEM_DESCRIPTOR_VISIBLE[] = "IsVisible";
static const char ITEM_DESCRIPTOR_WIDTH[] = "Width";
static const char ITEM_DESCRIPTOR_STYLE[] = "Style";
static const sal_Int32 ITEM_DESCRIPTOR_COMMANDURL_LEN = 10;
static const sal_Int32 ITEM_DESCRIPTOR_HELPURL_LEN = 7;
static const sal_Int32 ITEM_DESCRIPTOR_TOOLTIP_LEN = 7;
static const sal_Int32 ITEM_DESCRIPTOR_CONTAINER_LEN = 23;
static const sal_Int32 ITEM_DESCRIPTOR_LABEL_LEN = 5;
static const sal_Int32 ITEM_DESCRIPTOR_TYPE_LEN = 4;
static const sal_Int32 ITEM_DESCRIPTOR_VISIBLE_LEN = 9;
static const sal_Int32 ITEM_DESCRIPTOR_WIDTH_LEN = 5;
static const sal_Int32 ITEM_DESCRIPTOR_STYLE_LEN = 5;
static const sal_Int32 ITEM_DESCRIPTOR_COMMANDURL_LEN = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_COMMANDURL);
static const sal_Int32 ITEM_DESCRIPTOR_HELPURL_LEN = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_HELPURL);
static const sal_Int32 ITEM_DESCRIPTOR_TOOLTIP_LEN = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_TOOLTIP);
static const sal_Int32 ITEM_DESCRIPTOR_CONTAINER_LEN = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_CONTAINER);
static const sal_Int32 ITEM_DESCRIPTOR_LABEL_LEN = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_LABEL);
static const sal_Int32 ITEM_DESCRIPTOR_TYPE_LEN = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_TYPE);
static const sal_Int32 ITEM_DESCRIPTOR_VISIBLE_LEN = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_VISIBLE);
static const sal_Int32 ITEM_DESCRIPTOR_WIDTH_LEN = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_WIDTH);
static const sal_Int32 ITEM_DESCRIPTOR_STYLE_LEN = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_STYLE);
static const char HELPID_PREFIX[] = "helpid:";
static const char HELPID_PREFIX_TESTTOOL[] = ".HelpId:";
//static sal_Int32 HELPID_PREFIX_LENGTH = 7;
static const USHORT STARTID_CUSTOMIZE_POPUPMENU = 1000;
#define MENUPREFIX "private:resource/menubar/"
@ -564,7 +563,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
if ( m_bDisposed )
return;
if ( Event.FeatureURL.Complete.equalsAscii( ".uno:ImageOrientation" ))
if ( Event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ImageOrientation")) )
{
SfxImageItem aItem( 1, 0 );
aItem.PutValue( Event.State );
@ -889,7 +888,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const
aPropSeq = GetPropsForCommand( aCmdURL );
for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
{
if ( aPropSeq[i].Name.equalsAscii( "Name" ))
if ( aPropSeq[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Name")) )
{
aPropSeq[i].Value >>= aLabel;
break;
@ -907,7 +906,7 @@ sal_Int32 ToolBarManager::RetrievePropertiesFromCommand( const ::rtl::OUString&
aPropSeq = GetPropsForCommand( aCmdURL );
for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
{
if ( aPropSeq[i].Name.equalsAscii( "Properties" ))
if ( aPropSeq[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Properties")) )
{
aPropSeq[i].Value >>= nProperties;
break;
@ -1300,7 +1299,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
{
for ( int i = 0; i < aProp.getLength(); i++ )
{
if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_COMMANDURL, ITEM_DESCRIPTOR_COMMANDURL_LEN ))
if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
{
aProp[i].Value >>= aCommandURL;
if ( aCommandURL.compareToAscii(MENUPREFIX, RTL_CONSTASCII_LENGTH(MENUPREFIX) ) == 0 )
@ -1321,7 +1320,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
xMenuContainer->getByIndex(0) >>= aProps;
for ( sal_Int32 index=0; index<aProps.getLength(); ++index )
{
if ( aProps[ index ].Name.equalsAsciiL( ITEM_DESCRIPTOR_CONTAINER, ITEM_DESCRIPTOR_CONTAINER_LEN ))
if ( aProps[ index ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)) )
{
aProps[ index ].Value >>= aMenuDesc;
@ -1335,19 +1334,19 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
}
}
}
else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_HELPURL, ITEM_DESCRIPTOR_HELPURL_LEN ))
else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
aProp[i].Value >>= aHelpURL;
else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_TOOLTIP, ITEM_DESCRIPTOR_TOOLTIP_LEN ))
else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TOOLTIP)) )
aProp[i].Value >>= aTooltip;
else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_LABEL, ITEM_DESCRIPTOR_LABEL_LEN ))
else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_LABEL)) )
aProp[i].Value >>= aLabel;
else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_TYPE, ITEM_DESCRIPTOR_TYPE_LEN ))
else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
aProp[i].Value >>= nType;
else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_VISIBLE, ITEM_DESCRIPTOR_VISIBLE_LEN ))
else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_VISIBLE)) )
aProp[i].Value >>= bIsVisible;
else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_WIDTH, ITEM_DESCRIPTOR_WIDTH_LEN ))
else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_WIDTH)) )
aProp[i].Value >>= nWidth;
else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_STYLE, ITEM_DESCRIPTOR_STYLE_LEN ))
else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
aProp[i].Value >>= nStyle;
}
@ -2021,11 +2020,11 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
{
for ( sal_Int32 j = 0; j < aProp.getLength(); j++ )
{
if ( aProp[j].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL ))
if ( aProp[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
{
aProp[j].Value >>= aCommandURL;
}
else if ( aProp[j].Name.equalsAscii( ITEM_DESCRIPTOR_VISIBLE ))
else if ( aProp[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_VISIBLE)) )
{
aProp[j].Value >>= bVisible;
nVisibleIndex = j;

34
sfx2/source/appl/sfxhelp.cxx
View file

@ -518,7 +518,7 @@ String SfxHelp::GetHelpModuleName_Impl()
xCont->getByName( aModuleIdentifier ) >>= lProps;
for ( sal_Int32 i = 0; i < lProps.getLength(); ++i )
{
if ( lProps[i].Name.equalsAscii("ooSetupFactoryShortName") )
if ( lProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryShortName")) )
{
lProps[i].Value >>= aFactoryShortName;
break;
@ -535,26 +535,26 @@ String SfxHelp::GetHelpModuleName_Impl()
if ( aFactoryShortName.getLength() > 0 )
{
// Map some module identifiers to their "real" help module string.
if ( aFactoryShortName.equalsAscii( "chart2" ) )
if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart2")) )
aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "schart" ) );
else if ( aFactoryShortName.equalsAscii( "BasicIDE" ) )
else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("BasicIDE")) )
aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sbasic" ) );
else if ( aFactoryShortName.equalsAscii( "sweb" )
|| aFactoryShortName.equalsAscii( "sglobal" )
|| aFactoryShortName.equalsAscii( "swxform" ) )
else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sweb"))
|| aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sglobal"))
|| aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("swxform")) )
aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "swriter" ) );
else if ( aFactoryShortName.equalsAscii( "dbquery" )
|| aFactoryShortName.equalsAscii( "dbbrowser" )
|| aFactoryShortName.equalsAscii( "dbrelation" )
|| aFactoryShortName.equalsAscii( "dbtable" )
|| aFactoryShortName.equalsAscii( "dbapp" )
|| aFactoryShortName.equalsAscii( "dbreport" )
|| aFactoryShortName.equalsAscii( "swreport" )
|| aFactoryShortName.equalsAscii( "dbbrowser" )
|| aFactoryShortName.equalsAscii( "swform" ) )
else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbquery"))
|| aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbbrowser"))
|| aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbrelation"))
|| aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbtable"))
|| aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbapp"))
|| aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbreport"))
|| aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("swreport"))
|| aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbbrowser"))
|| aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("swform")) )
aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sdatabase" ) );
else if ( aFactoryShortName.equalsAscii( "sbibliography" )
|| aFactoryShortName.equalsAscii( "StartModule" ) )
else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sbibliography"))
|| aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("StartModule")) )
aFactoryShortName = sDefaultModule;
}
else

24
sfx2/source/bastyp/fltfnc.cxx
View file

@ -940,33 +940,33 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
sal_Int32 nFilterProperty = 0 ;
for( nFilterProperty=0; nFilterProperty<nFilterPropertyCount; ++nFilterProperty )
{
if( lFilterProperties[nFilterProperty].Name.compareToAscii( "FileFormatVersion" ) == 0 )
if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileFormatVersion")) )
{
lFilterProperties[nFilterProperty].Value >>= nFormatVersion;
}
else if( lFilterProperties[nFilterProperty].Name.compareToAscii( "TemplateName" ) == 0 )
else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TemplateName")) )
{
lFilterProperties[nFilterProperty].Value >>= sDefaultTemplate;
}
else if( lFilterProperties[nFilterProperty].Name.compareToAscii( "Flags" ) == 0 )
else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Flags")) )
{
lFilterProperties[nFilterProperty].Value >>= nFlags;
}
else if( lFilterProperties[nFilterProperty].Name.compareToAscii( "UIName" ) == 0 )
else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UIName")) )
{
lFilterProperties[nFilterProperty].Value >>= sUIName;
}
else if( lFilterProperties[nFilterProperty].Name.compareToAscii( "UserData" ) == 0 )
else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserData")) )
{
::com::sun::star::uno::Sequence< ::rtl::OUString > lUserData;
lFilterProperties[nFilterProperty].Value >>= lUserData;
sUserData = implc_convertStringlistToString( lUserData, ',', ::rtl::OUString() );
}
else if( lFilterProperties[nFilterProperty].Name.compareToAscii( "DocumentService" ) == 0 )
else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocumentService")) )
{
lFilterProperties[nFilterProperty].Value >>= sServiceName;
}
else if( lFilterProperties[nFilterProperty].Name.compareToAscii( "Type" ) == 0 )
else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Type")) )
{
lFilterProperties[nFilterProperty].Value >>= sType;
// Try to get filter .. but look for any exceptions!
@ -988,25 +988,25 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
sal_Int32 nTypeProperty = 0 ;
for( nTypeProperty=0; nTypeProperty<nTypePropertyCount; ++nTypeProperty )
{
if( lTypeProperties[nTypeProperty].Name.compareToAscii( "ClipboardFormat" ) == 0 )
if( lTypeProperties[nTypeProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ClipboardFormat")) )
{
lTypeProperties[nTypeProperty].Value >>= sHumanName;
}
else if( lTypeProperties[nTypeProperty].Name.compareToAscii( "DocumentIconID" ) == 0 )
else if( lTypeProperties[nTypeProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocumentIconID")) )
{
lTypeProperties[nTypeProperty].Value >>= nDocumentIconId;
}
else if( lTypeProperties[nTypeProperty].Name.compareToAscii( "MediaType" ) == 0 )
else if( lTypeProperties[nTypeProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MediaType")) )
{
lTypeProperties[nTypeProperty].Value >>= sMimeType;
}
else if( lTypeProperties[nTypeProperty].Name.compareToAscii( "Extensions" ) == 0 )
else if( lTypeProperties[nTypeProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Extensions")) )
{
::com::sun::star::uno::Sequence< ::rtl::OUString > lExtensions;
lTypeProperties[nTypeProperty].Value >>= lExtensions;
sExtension = implc_convertStringlistToString( lExtensions, ';', DEFINE_CONST_UNICODE("*.") );
}
else if( lTypeProperties[nTypeProperty].Name.compareToAscii( "URLPattern" ) == 0 )
else if( lTypeProperties[nTypeProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URLPattern")) )
{
::com::sun::star::uno::Sequence< ::rtl::OUString > lPattern;
lTypeProperties[nTypeProperty].Value >>= lPattern;

38
sfx2/source/doc/sfxbasemodel.cxx
View file

@ -943,7 +943,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const ::rtl::OUString&
throw(::com::sun::star::uno::RuntimeException)
{
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
if ( rURL.getLength() == 0 && rArgs.getLength() == 1 && rArgs[0].Name.equalsAscii( "SetEmbedded" ) )
if ( rURL.getLength() == 0 && rArgs.getLength() == 1 && rArgs[0].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SetEmbedded")) )
{
// allows to set a windowless document to EMBEDDED state
// but _only_ before load() or initNew() methods
@ -1916,7 +1916,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
if ( m_pData->m_pObjectShell.Is() )
{
if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"" ) )
if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"")) )
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
{
@ -1945,7 +1945,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
else
throw datatransfer::UnsupportedFlavorException();
}
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-embed-source;windows_formatname=\"Star EMBS\"" ) )
else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-embed-source;windows_formatname=\"Star EMBS\"")) )
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
{
@ -1970,7 +1970,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
else
throw datatransfer::UnsupportedFlavorException();
}
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ) )
else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"")) )
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
{
@ -1991,7 +1991,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
else
throw datatransfer::UnsupportedFlavorException();
}
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" ) )
else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"")) )
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
{
@ -2011,7 +2011,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
else
throw datatransfer::UnsupportedFlavorException();
}
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ) )
else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-emf;windows_formatname=\"Image EMF\"")) )
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
{
@ -2046,7 +2046,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
else
throw datatransfer::UnsupportedFlavorException();
}
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ) )
else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-wmf;windows_formatname=\"Image WMF\"")) )
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
{
@ -2086,7 +2086,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
else
throw datatransfer::UnsupportedFlavorException();
}
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ) )
else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"")) )
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
{
@ -2110,7 +2110,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
else
throw datatransfer::UnsupportedFlavorException();
}
else if ( aFlavor.MimeType.equalsAscii( "image/png" ) )
else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("image/png")) )
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
{
@ -2220,17 +2220,17 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const DATAFLAVOR& aFlavor
{
SfxModelGuard aGuard( *this );
if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ) )
if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"")) )
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
return sal_True;
}
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" ) )
else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"")) )
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
return sal_True;
}
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ) )
else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-emf;windows_formatname=\"Image EMF\"")) )
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
return sal_True;
@ -2238,7 +2238,7 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const DATAFLAVOR& aFlavor
&& aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) )
return sal_True;
}
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ) )
else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-wmf;windows_formatname=\"Image WMF\"")) )
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
return sal_True;
@ -2246,22 +2246,22 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const DATAFLAVOR& aFlavor
&& aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) )
return sal_True;
}
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"" ) )
else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"")) )
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
return sal_True;
}
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-embed-source;windows_formatname=\"Star EMBS\"" ) )
else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-embed-source;windows_formatname=\"Star EMBS\"")) )
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
return sal_True;
}
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ) )
else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"")) )
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
return sal_True;
}
else if ( aFlavor.MimeType.equalsAscii( "image/png" ) )
else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("image/png")) )
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
return sal_True;
@ -2390,7 +2390,7 @@ void addTitle_Impl( Sequence < ::com::sun::star::beans::PropertyValue >& rSeq, c
for ( nArg = 0; nArg < nCount; nArg++ )
{
::com::sun::star::beans::PropertyValue& rProp = rSeq[nArg];
if ( rProp.Name.equalsAscii("Title") )
if ( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title")) )
{
rProp.Value <<= rTitle;
break;
@ -3183,7 +3183,7 @@ static void GetCommandFromSequence( rtl::OUString& rCommand, sal_Int32& nIndex,
for ( sal_Int32 i = 0; i < rSeqPropValue.getLength(); i++ )
{
if ( rSeqPropValue[i].Name.equalsAsciiL( "Command", 7 ))
if ( rSeqPropValue[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Command")) )
{
rSeqPropValue[i].Value >>= rCommand;
nIndex = i;

50
sfx2/source/notify/eventsupplier.cxx
View file

@ -104,7 +104,7 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const OUSTRING & aName, const ANY &
::rtl::OUString sType;
if ( ( aProperties.getLength() == 1 )
&& ( aProperties[0].Name.compareToAscii( PROP_EVENT_TYPE ) == 0 )
&& ( aProperties[0].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_EVENT_TYPE)) )
&& ( aProperties[0].Value >>= sType )
&& ( sType.getLength() == 0 )
)
@ -217,13 +217,13 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg
sal_Int32 nIndex = 0;
while ( nIndex < nCount )
{
if ( aProperties[ nIndex ].Name.compareToAscii( PROP_EVENT_TYPE ) == 0 )
if (aProperties[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_EVENT_TYPE)))
aProperties[ nIndex ].Value >>= aType;
else if ( aProperties[ nIndex ].Name.compareToAscii( PROP_SCRIPT ) == 0 )
else if (aProperties[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_SCRIPT)))
aProperties[ nIndex ].Value >>= aScript;
else if ( aProperties[ nIndex ].Name.compareToAscii( PROP_LIBRARY ) == 0 )
else if (aProperties[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_LIBRARY)))
aProperties[ nIndex ].Value >>= aLibrary;
else if ( aProperties[ nIndex ].Name.compareToAscii( PROP_MACRO_NAME ) == 0 )
else if (aProperties[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_MACRO_NAME)))
aProperties[ nIndex ].Value >>= aMacroName;
else {
DBG_ERROR("Unknown property value!");
@ -231,13 +231,13 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg
nIndex += 1;
}
if ( aType.compareToAscii( STAR_BASIC ) == 0 && aScript.getLength() )
if (aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STAR_BASIC)) && aScript.getLength())
{
com::sun::star::uno::Any aAny;
SfxMacroLoader::loadMacro( aScript, aAny, pDoc );
}
else if ( aType.compareToAscii( "Service" ) == 0 ||
aType.compareToAscii( "Script" ) == 0 )
else if (aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Service")) ||
aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Script")))
{
if ( aScript.getLength() )
{
@ -400,13 +400,13 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* p
while ( nIndex < nCount )
{
if ( aProperties[ nIndex ].Name.compareToAscii( PROP_EVENT_TYPE ) == 0 )
if (aProperties[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_EVENT_TYPE)))
aProperties[ nIndex ].Value >>= aType;
else if ( aProperties[ nIndex ].Name.compareToAscii( PROP_SCRIPT ) == 0 )
else if (aProperties[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_SCRIPT)))
aProperties[ nIndex ].Value >>= aScriptURL;
else if ( aProperties[ nIndex ].Name.compareToAscii( PROP_LIBRARY ) == 0 )
else if (aProperties[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_LIBRARY)))
aProperties[ nIndex ].Value >>= aLibrary;
else if ( aProperties[ nIndex ].Name.compareToAscii( PROP_MACRO_NAME ) == 0 )
else if (aProperties[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_MACRO_NAME)))
aProperties[ nIndex ].Value >>= aMacroName;
else {
DBG_ERROR("Unknown propery value!");
@ -416,11 +416,11 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* p
// Get the type
ScriptType eType( STARBASIC );
if ( aType.compareToAscii( STAR_BASIC ) == COMPARE_EQUAL )
if (aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STAR_BASIC)))
eType = STARBASIC;
else if ( aType.compareToAscii( "Script" ) == COMPARE_EQUAL && aScriptURL.getLength() )
else if (aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Script")) && aScriptURL.getLength())
eType = EXTENDED_STYPE;
else if ( aType.compareToAscii( SVX_MACRO_LANGUAGE_JAVASCRIPT ) == COMPARE_EQUAL )
else if (aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SVX_MACRO_LANGUAGE_JAVASCRIPT)))
eType = JAVASCRIPT;
else {
DBG_ERRORFILE( "ConvertToMacro: Unknown macro type" );
@ -428,7 +428,7 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* p
if ( aMacroName.getLength() )
{
if ( aLibrary.compareToAscii("application") == 0 )
if (aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application")))
aLibrary = SFX_APP()->GetName();
else
aLibrary = ::rtl::OUString();
@ -466,28 +466,28 @@ void SfxEvents_Impl::BlowUpMacro( const ANY& rEvent, ANY& rRet, SfxObjectShell*
while ( nIndex < nCount )
{
if ( aInProps[ nIndex ].Name.compareToAscii( PROP_EVENT_TYPE ) == 0 )
if (aInProps[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_EVENT_TYPE)))
{
aInProps[nIndex].Value >>= aType;
aOutProps[0] = aInProps[nIndex];
}
else if ( aInProps[ nIndex ].Name.compareToAscii( PROP_SCRIPT ) == 0 )
else if (aInProps[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_SCRIPT)))
{
aInProps[nIndex].Value >>= aScript;
aOutProps[1] = aInProps[nIndex];
}
else if ( aInProps[ nIndex ].Name.compareToAscii( PROP_LIBRARY ) == 0 )
else if (aInProps[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_LIBRARY)))
{
aInProps[ nIndex ].Value >>= aLibrary;
}
else if ( aInProps[ nIndex ].Name.compareToAscii( PROP_MACRO_NAME ) == 0 )
else if (aInProps[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_MACRO_NAME)))
{
aInProps[ nIndex ].Value >>= aMacroName;
}
nIndex += 1;
}
if ( aType.compareToAscii( STAR_BASIC ) == 0 )
if (aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STAR_BASIC)))
{
aOutProps.realloc(4);
if ( aScript.getLength() )
@ -499,7 +499,7 @@ void SfxEvents_Impl::BlowUpMacro( const ANY& rEvent, ANY& rRet, SfxObjectShell*
if ( ( nHashPos != STRING_NOTFOUND ) && ( nHashPos < nArgsPos ) )
{
OUSTRING aBasMgrName( INetURLObject::decode( aScript.copy( 8, nHashPos-8 ), INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET ) );
if ( aBasMgrName.compareToAscii(".") == 0 )
if (aBasMgrName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".")))
aLibrary = pDoc->GetTitle();
/*
else if ( aBasMgrName.getLength() )
@ -520,7 +520,7 @@ void SfxEvents_Impl::BlowUpMacro( const ANY& rEvent, ANY& rRet, SfxObjectShell*
else if ( aMacroName.getLength() )
{
aScript = OUSTRING( RTL_CONSTASCII_USTRINGPARAM( MACRO_PRFIX ) );
if ( aLibrary.compareTo( SFX_APP()->GetName() ) != 0 && aLibrary.compareToAscii("StarDesktop") != 0 && aLibrary.compareToAscii("application") != 0 )
if ( aLibrary.compareTo( SFX_APP()->GetName() ) != 0 && !aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("StarDesktop")) && !aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application")) )
aScript += String('.');
aScript += String('/');
@ -531,7 +531,7 @@ void SfxEvents_Impl::BlowUpMacro( const ANY& rEvent, ANY& rRet, SfxObjectShell*
// wrong properties
return;
if ( aLibrary.compareToAscii("document") != 0 )
if (!aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("document")))
{
if ( !aLibrary.getLength() || (pDoc && ( String(aLibrary) == pDoc->GetTitle( SFX_TITLE_APINAME ) || String(aLibrary) == pDoc->GetTitle() )) )
aLibrary = String::CreateFromAscii("document");
@ -547,7 +547,7 @@ void SfxEvents_Impl::BlowUpMacro( const ANY& rEvent, ANY& rRet, SfxObjectShell*
aOutProps[3].Value <<= aMacroName;
rRet <<= aOutProps;
}
else if ( aType.compareToAscii( SVX_MACRO_LANGUAGE_JAVASCRIPT ) == 0 )
else if (aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SVX_MACRO_LANGUAGE_JAVASCRIPT)))
{
aOutProps[1] = aInProps[1];
rRet <<= aOutProps;

8
sfx2/source/view/sfxbasecontroller.cxx
View file

@ -792,7 +792,7 @@ REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch( const UNOU
SfxViewFrame* pAct = m_pData->m_pViewShell->GetViewFrame() ;
if ( !m_pData->m_bDisposing )
{
if ( sTargetFrameName.compareToAscii( "_beamer" ) == COMPARE_EQUAL )
if ( sTargetFrameName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("_beamer")) )
{
SfxViewFrame *pFrame = m_pData->m_pViewShell->GetViewFrame();
if ( eSearchFlags & ( ::com::sun::star::frame::FrameSearchFlag::CREATE ))
@ -809,7 +809,7 @@ REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch( const UNOU
return xProv->queryDispatch( aURL, sTargetFrameName, ::com::sun::star::frame::FrameSearchFlag::SELF );
}
if ( aURL.Protocol.compareToAscii( ".uno:" ) == COMPARE_EQUAL )
if ( aURL.Protocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:")) )
{
rtl::OUString aMasterCommand = SfxOfficeDispatch::GetMasterUnoCommand( aURL );
sal_Bool bMasterCommand( aMasterCommand.getLength() > 0 );
@ -865,7 +865,7 @@ REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch( const UNOU
}
}
}
else if ( aURL.Protocol.compareToAscii( "slot:" ) == COMPARE_EQUAL )
else if ( aURL.Protocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("slot:")) )
{
USHORT nId = (USHORT) aURL.Path.toInt32();
@ -917,7 +917,7 @@ REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch( const UNOU
}
}
}
else if( sTargetFrameName.compareToAscii( "_self" )==COMPARE_EQUAL || sTargetFrameName.getLength()==0 )
else if( sTargetFrameName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("_self")) || sTargetFrameName.getLength()==0 )
{
// check for already loaded URL ... but with additional jumpmark!
REFERENCE< XMODEL > xModel = getModel();

38
xmlhelp/source/cxxhelp/provider/content.cxx
View file

@ -313,7 +313,7 @@ uno::Any SAL_CALL Content::execute(
{
uno::Any aRet;
if ( aCommand.Name.compareToAscii( "getPropertyValues" ) == 0 )
if ( aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getPropertyValues")) )
{
uno::Sequence< beans::Property > Properties;
if ( !( aCommand.Argument >>= Properties ) )
@ -324,7 +324,7 @@ uno::Any SAL_CALL Content::execute(
aRet <<= getPropertyValues( Properties );
}
else if ( aCommand.Name.compareToAscii( "setPropertyValues" ) == 0 )
else if ( aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("setPropertyValues")) )
{
uno::Sequence<beans::PropertyValue> propertyValues;
@ -347,17 +347,17 @@ uno::Any SAL_CALL Content::execute(
aRet <<= ret;
}
else if ( aCommand.Name.compareToAscii( "getPropertySetInfo" ) == 0 )
else if ( aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getPropertySetInfo")) )
{
// Note: Implemented by base class.
aRet <<= getPropertySetInfo( Environment );
}
else if ( aCommand.Name.compareToAscii( "getCommandInfo" ) == 0 )
else if ( aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getCommandInfo")) )
{
// Note: Implemented by base class.
aRet <<= getCommandInfo( Environment );
}
else if ( aCommand.Name.compareToAscii( "open" ) == 0 )
else if ( aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("open")) )
{
ucb::OpenCommandArgument2 aOpenCommand;
if ( !( aCommand.Argument >>= aOpenCommand ) )
@ -459,26 +459,26 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
{
const beans::Property& rProp = rProperties[n];
if ( rProp.Name.compareToAscii( "ContentType" ) == 0 )
if ( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ContentType")) )
xRow->appendString(
rProp,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"application/vnd.sun.star.help" )) );
else if( rProp.Name.compareToAscii( "Title" ) == 0 )
else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title")) )
xRow->appendString ( rProp,m_aURLParameter.get_title() );
else if( rProp.Name.compareToAscii( "IsReadOnly" ) == 0 )
else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsReadOnly")) )
xRow->appendBoolean( rProp,true );
else if( rProp.Name.compareToAscii( "IsDocument" ) == 0 )
else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsDocument")) )
xRow->appendBoolean(
rProp,
m_aURLParameter.isFile() || m_aURLParameter.isRoot() );
else if( rProp.Name.compareToAscii( "IsFolder" ) == 0 )
else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsFolder")) )
xRow->appendBoolean(
rProp,
! m_aURLParameter.isFile() || m_aURLParameter.isRoot() );
else if( rProp.Name.compareToAscii( "IsErrorDocument" ) == 0 )
else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsErrorDocument")) )
xRow->appendBoolean( rProp, m_aURLParameter.isErrorDocument() );
else if( rProp.Name.compareToAscii( "MediaType" ) == 0 )
else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MediaType")) )
if( m_aURLParameter.isPicture() )
xRow->appendString(
rProp,
@ -497,7 +497,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
else
xRow->appendVoid( rProp );
else if( m_aURLParameter.isModule() )
if( rProp.Name.compareToAscii( "KeywordList" ) == 0 )
if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KeywordList")) )
{
KeywordInfo *inf =
m_pDatabases->getKeyword( m_aURLParameter.get_module(),
@ -508,7 +508,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
aAny <<= inf->getKeywordList();
xRow->appendObject( rProp,aAny );
}
else if( rProp.Name.compareToAscii( "KeywordRef" ) == 0 )
else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KeywordRef")) )
{
KeywordInfo *inf =
m_pDatabases->getKeyword( m_aURLParameter.get_module(),
@ -519,7 +519,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
aAny <<= inf->getIdList();
xRow->appendObject( rProp,aAny );
}
else if( rProp.Name.compareToAscii( "KeywordAnchorForRef" ) == 0 )
else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KeywordAnchorForRef")) )
{
KeywordInfo *inf =
m_pDatabases->getKeyword( m_aURLParameter.get_module(),
@ -530,7 +530,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
aAny <<= inf->getAnchorList();
xRow->appendObject( rProp,aAny );
}
else if( rProp.Name.compareToAscii( "KeywordTitleForRef" ) == 0 )
else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KeywordTitleForRef")) )
{
KeywordInfo *inf =
m_pDatabases->getKeyword( m_aURLParameter.get_module(),
@ -541,7 +541,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
aAny <<= inf->getTitleList();
xRow->appendObject( rProp,aAny );
}
else if( rProp.Name.compareToAscii( "SearchScopes" ) == 0 )
else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SearchScopes")) )
{
uno::Sequence< rtl::OUString > seq( 2 );
seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Heading" ));
@ -550,7 +550,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
aAny <<= seq;
xRow->appendObject( rProp,aAny );
}
else if( rProp.Name.compareToAscii( "Order" ) == 0 )
else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Order")) )
{
StaticModuleInformation *inf =
m_pDatabases->getStaticInformationForModule(
@ -564,7 +564,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
}
else
xRow->appendVoid( rProp );
else if( rProp.Name.compareToAscii( "AnchorName" ) == 0 &&
else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AnchorName")) &&
m_aURLParameter.isFile() )
xRow->appendString( rProp,m_aURLParameter.get_tag() );
else