diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-05-30 11:30:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-30 15:47:20 +0100 |
| commit | 33a49289dfdba94c92dfd466635c4c663e916848 (patch) | |
| tree | b2ff25a773c7420f698c29712699d9d242a97266 /vcl | |
| parent | e8dff0479e568c6d8de517782ac22ba987f81da1 (diff) | |
move the one single use of EnableMenuStrings to its call site
Change-Id: Ie5087f564c024cae526757ed1445c97113e8a68e
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 1 | ||||
| -rw-r--r-- | vcl/source/window/toolbox2.cxx | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 3cb978abb14d..7327a5eee2b9 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1373,7 +1373,6 @@ void ToolBox::ImplInitToolBoxData() mbCustomize = false; mbCustomizeMode = false; mbDragging = false; - mbMenuStrings = false; mbIsShift = false; mbIsKeyEvent = false; mbChangingHighlight = false; diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 7a93e507f185..3b0cd6101ae2 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -20,7 +20,6 @@ #include "sal/config.h" #include <comphelper/processfactory.hxx> -#include <comphelper/string.hxx> #include <tools/debug.hxx> #include <tools/rc.h> @@ -338,11 +337,7 @@ bool ImplToolItem::IsItemHidden() const const OUString ToolBox::ImplConvertMenuString( const OUString& rStr ) { - OUString aCvtStr( rStr ); - if ( mbMenuStrings ) - aCvtStr = comphelper::string::stripEnd(aCvtStr, '.'); - aCvtStr = MnemonicGenerator::EraseAllMnemonicChars( aCvtStr ); - return aCvtStr; + return MnemonicGenerator::EraseAllMnemonicChars(rStr); } void ToolBox::ImplInvalidate( bool bNewCalc, bool bFullPaint ) |