Skip to content

C
core
Kaydet (Commit) d3ab469b authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert svtools/source/control/toolbarmenuimp.hxx from String to OUString 

Change-Id: If4a61b5d9f24c7dd7d815540d40c13e1d784d574
üst e41b17ac
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
svtools/source/control/toolbarmenu.cxx
Dosyayı görüntüle @ d3ab469b
...@@ -80,7 +80,7 @@ void ToolbarMenuEntry::init( int nEntryId, MenuItemBits nBits ) ...@@ -80,7 +80,7 @@ void ToolbarMenuEntry::init( int nEntryId, MenuItemBits nBits )
// -------------------------------------------------------------------- // --------------------------------------------------------------------
ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const String& rText, MenuItemBits nBits ) ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const OUString& rText, MenuItemBits nBits )
: mrMenu( rMenu ) : mrMenu( rMenu )
{ {
init( nEntryId, nBits ); init( nEntryId, nBits );
...@@ -91,7 +91,7 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Stri ...@@ -91,7 +91,7 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Stri
// -------------------------------------------------------------------- // --------------------------------------------------------------------
ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, const String& rText, MenuItemBits nBits ) ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, const OUString& rText, MenuItemBits nBits )
: mrMenu( rMenu ) : mrMenu( rMenu )
{ {
init( nEntryId, nBits ); init( nEntryId, nBits );
...@@ -1476,7 +1476,7 @@ void ToolbarMenu::implPaint( ToolbarMenuEntry* pThisOnly, bool bHighlighted ) ...@@ -1476,7 +1476,7 @@ void ToolbarMenu::implPaint( ToolbarMenuEntry* pThisOnly, bool bHighlighted )
aTmpPos.Y() += nTextOffsetY; aTmpPos.Y() += nTextOffsetY;
sal_uInt16 nStyle = nTextStyle|TEXT_DRAW_MNEMONIC; sal_uInt16 nStyle = nTextStyle|TEXT_DRAW_MNEMONIC;
DrawCtrlText( aTmpPos, pEntry->maText, 0, pEntry->maText.Len(), nStyle, NULL, NULL ); // pVector, pDisplayText ); DrawCtrlText( aTmpPos, pEntry->maText, 0, pEntry->maText.getLength(), nStyle, NULL, NULL ); // pVector, pDisplayText );
} }
if ( pThisOnly && bHighlighted ) if ( pThisOnly && bHighlighted )
......
svtools/source/control/toolbarmenuimp.hxx
Dosyayı görüntüle @ d3ab469b
...@@ -71,7 +71,7 @@ public: ...@@ -71,7 +71,7 @@ public:
bool mbChecked; bool mbChecked;
bool mbEnabled; bool mbEnabled;
String maText; OUString maText;
Image maImage; Image maImage;
Control* mpControl; Control* mpControl;
Rectangle maRect; Rectangle maRect;
...@@ -79,8 +79,8 @@ public: ...@@ -79,8 +79,8 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > mxAccContext; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > mxAccContext;
public: public:
ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const String& rText, MenuItemBits nBits ); ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const OUString& rText, MenuItemBits nBits );
ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, const String& rText, MenuItemBits nBits ); ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, const OUString& rText, MenuItemBits nBits );
ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, Control* pControl, MenuItemBits nBits ); ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, Control* pControl, MenuItemBits nBits );
~ToolbarMenuEntry(); ~ToolbarMenuEntry();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment