diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-06-14 00:14:34 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-06-21 11:18:04 +0400 |
| commit | df59e1d5bd56904caf4feae14e679255ed024128 (patch) | |
| tree | f12e3a912a347b0198efd74b619e5eb04db2e64a /vcl | |
| parent | 1b7e9855d9e90bbd33b78b7da0b65dc915800cc6 (diff) | |
no need to be a class member
Change-Id: I230e8972340b409c6da70a4c988ac1d531a9f3b5
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/vcl/toolbox.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/toolbox2.cxx | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx index 0c4e58527b7a..13f4c1f3adc3 100644 --- a/vcl/inc/vcl/toolbox.hxx +++ b/vcl/inc/vcl/toolbox.hxx @@ -176,7 +176,6 @@ class VCL_DLLPUBLIC ToolBox : public DockingWindow private: ImplToolBoxPrivateData* mpData; ImplToolSizeArray* mpFloatSizeAry; - XubString maCvtStr; ImageList maImageList; Timer maTimer; Rectangle maUpperRect; @@ -262,7 +261,7 @@ private: using Window::ImplInvalidate; SAL_DLLPRIVATE void ImplInvalidate( sal_Bool bNewCalc = sal_False, sal_Bool bFullPaint = sal_False ); SAL_DLLPRIVATE void ImplUpdateItem( sal_uInt16 nIndex = 0xFFFF ); - SAL_DLLPRIVATE const XubString& ImplConvertMenuString( const XubString& rStr ); + SAL_DLLPRIVATE const rtl::OUString ImplConvertMenuString( const XubString& rStr ); SAL_DLLPRIVATE sal_Bool ImplHandleMouseMove( const MouseEvent& rMEvt, sal_Bool bRepeat = sal_False ); SAL_DLLPRIVATE sal_Bool ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCancel = sal_False ); SAL_DLLPRIVATE void ImplChangeHighlight( ImplToolItem* pItem, sal_Bool bNoGrabFocus = sal_False ); diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 3c924cf2c25b..ff2c3bb2d1f1 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -400,13 +400,13 @@ sal_Bool ImplToolItem::IsClipped() const // ----------------------------------------------------------------------- // ----------------------------------------------------------------------- -const XubString& ToolBox::ImplConvertMenuString( const XubString& rStr ) +const rtl::OUString ToolBox::ImplConvertMenuString( const XubString& rStr ) { - maCvtStr = rStr; + rtl::OUString aCvtStr( rStr ); if ( mbMenuStrings ) - maCvtStr = comphelper::string::stripEnd(maCvtStr, '.'); - maCvtStr = MnemonicGenerator::EraseAllMnemonicChars( maCvtStr ); - return maCvtStr; + aCvtStr = comphelper::string::stripEnd(aCvtStr, '.'); + aCvtStr = MnemonicGenerator::EraseAllMnemonicChars( aCvtStr ); + return aCvtStr; } // ----------------------------------------------------------------------- |