From 73342dbb82ba074d01962359dac50fb2aa36cbeb Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 21 Nov 2013 15:52:45 +0200 Subject: remove unnecessary RTL_CONSTASCII_STRINGPARAM A final pass through the code, converting code to use the new OUString and OString methods that can detect string literals. Change-Id: Ifa6382335e5650a1c67e52006b26354e0692c710 --- framework/source/classes/menumanager.cxx | 2 +- framework/source/uifactory/uicontrollerfactory.cxx | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'framework') diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 13f2aec7ddac..0df49f784035 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -744,7 +744,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) m_bActive = sal_True; OUString aCommand( m_aMenuItemCommand ); - if (m_aMenuItemCommand.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(UNO_COMMAND))) + if (m_aMenuItemCommand.matchIgnoreAsciiCase(UNO_COMMAND)) { // Remove protocol part from command so we can use an easier comparision method aCommand = aCommand.copy(RTL_CONSTASCII_LENGTH(UNO_COMMAND)); diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx index 2303bebf89e4..e14eba7a0ade 100644 --- a/framework/source/uifactory/uicontrollerfactory.cxx +++ b/framework/source/uifactory/uicontrollerfactory.cxx @@ -49,9 +49,7 @@ UIControllerFactory::UIControllerFactory( , m_pConfigAccess() { rtl::OUStringBuffer aBuffer; - aBuffer.appendAscii( - RTL_CONSTASCII_STRINGPARAM( - "/org.openoffice.Office.UI.Controller/Registered/" ) ); + aBuffer.append( "/org.openoffice.Office.UI.Controller/Registered/" ); aBuffer.append( rConfigurationNode ); m_pConfigAccess = new ConfigurationAccess_ControllerFactory( m_xContext, aBuffer.makeStringAndClear() ); m_pConfigAccess->acquire(); -- cgit