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

convert include/svtools/toolbarmenu.hxx from String to OUString

Browse source 
Change-Id: I41763b927cc8050bf1b461c91be527164f9fc14d
This commit is contained in:
Noel Grandin 2013-08-08 14:11:23 +02:00
parent 60dddd2012
commit 710be6c8d4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/svtools/toolbarmenu.hxx
View file

@ -66,8 +66,8 @@ public:
virtual void GetFocus();
virtual void LoseFocus();
void appendEntry( int nEntryId, const String& rStr, MenuItemBits nItemBits = 0 );
void appendEntry( int nEntryId, const String& rStr, const Image& rImage, MenuItemBits nItemBits = 0 );
void appendEntry( int nEntryId, const OUString& rStr, MenuItemBits nItemBits = 0 );
void appendEntry( int nEntryId, const OUString& rStr, const Image& rImage, MenuItemBits nItemBits = 0 );
void appendEntry( int nEntryId, Control* pControl, MenuItemBits nItemBits = 0 );
void appendSeparator();
@ -78,7 +78,7 @@ public:
void enableEntry( int nEntryId, bool bEnable = true );
void setEntryText( int nEntryId, const String& rStr );
void setEntryText( int nEntryId, const OUString& rStr );
void setEntryImage( int nEntryId, const Image& rImage );

6
svtools/source/control/toolbarmenu.cxx
View file

@ -540,7 +540,7 @@ void ToolbarMenu::enableEntry( int nEntryId, bool bEnable )
// --------------------------------------------------------------------
void ToolbarMenu::setEntryText( int nEntryId, const String& rStr )
void ToolbarMenu::setEntryText( int nEntryId, const OUString& rStr )
{
ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId );
if( pEntry && pEntry->maText != rStr )
@ -793,14 +793,14 @@ void ToolbarMenu::LoseFocus()
// --------------------------------------------------------------------
void ToolbarMenu::appendEntry( int nEntryId, const String& rStr, MenuItemBits nItemBits )
void ToolbarMenu::appendEntry( int nEntryId, const OUString& rStr, MenuItemBits nItemBits )
{
appendEntry( new ToolbarMenuEntry( *this, nEntryId, rStr, nItemBits ) );
}
// --------------------------------------------------------------------
void ToolbarMenu::appendEntry( int nEntryId, const String& rStr, const Image& rImage, MenuItemBits nItemBits )
void ToolbarMenu::appendEntry( int nEntryId, const OUString& rStr, const Image& rImage, MenuItemBits nItemBits )
{
appendEntry( new ToolbarMenuEntry( *this, nEntryId, rImage, rStr, nItemBits ) );
}