diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-20 12:02:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-22 10:49:28 +0200 |
| commit | d3ab469bf8cfd6f6edb19a692430b3c9baa6d1cc (patch) | |
| tree | 62185c58ff91ab7e4cd94c22467ce80d90ddc5a4 | |
| parent | e41b17ac4eec184de106d82eb70d0bc238fc0799 (diff) | |
convert svtools/source/control/toolbarmenuimp.hxx from String to OUString
Change-Id: If4a61b5d9f24c7dd7d815540d40c13e1d784d574
| -rw-r--r-- | svtools/source/control/toolbarmenu.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/control/toolbarmenuimp.hxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index caaedd00f675..f59d0356355a 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -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 ) { init( nEntryId, nBits ); @@ -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 ) { init( nEntryId, nBits ); @@ -1476,7 +1476,7 @@ void ToolbarMenu::implPaint( ToolbarMenuEntry* pThisOnly, bool bHighlighted ) aTmpPos.Y() += nTextOffsetY; 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 ) diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index 2747e01e6336..34b1e1f7f232 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -71,7 +71,7 @@ public: bool mbChecked; bool mbEnabled; - String maText; + OUString maText; Image maImage; Control* mpControl; Rectangle maRect; @@ -79,8 +79,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > mxAccContext; public: - ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const String& rText, MenuItemBits nBits ); - ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, const String& rText, MenuItemBits nBits ); + ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const OUString& 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(); |