mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no need to be a class member

Browse Source 
Change-Id: I230e8972340b409c6da70a4c988ac1d531a9f3b5
This commit is contained in:
Ivan Timofeev
2012-06-14 00:14:34 +04:00
parent 1b7e9855d9
commit df59e1d5bd
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vcl/inc/vcl/toolbox.hxx
View File

@@ -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 );

10
vcl/source/window/toolbox2.cxx
View File

@@ -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;
}
// -----------------------------------------------------------------------