#98414# export MnemonicGenerator

3 files changed, 15 insertions, 14 deletions

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 5e08eb6be69d..79e4ce0254fa 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dialog.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: ssa $ $Date: 2001-12-10 13:36:20 $
+ *  last change: $Author: ssa $ $Date: 2002-05-16 11:20:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -171,7 +171,7 @@ static BOOL ImplIsMnemonicCtrl( Window* pWindow )
 
 void ImplWindowAutoMnemonic( Window* pWindow )
 {
-    ImplMnemonicGenerator   aMnemonicGenerator;
+    MnemonicGenerator   aMnemonicGenerator;
     Window*                 pGetChild;
     Window*                 pChild;
 
@@ -323,6 +323,7 @@ void Dialog::ImplInit( Window* pParent, WinBits nStyle )
     // Now, all Dialogs are per default system windows !!!
     nStyle |= WB_SYSTEMWINDOW;
 
+
     if ( !pParent )
     {
         pParent = Application::GetDefDialogParent();
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index da0de9b8750a..193ab102c358 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: menu.cxx,v $
  *
- *  $Revision: 1.41 $
+ *  $Revision: 1.42 $
  *
- *  last change: $Author: mba $ $Date: 2002-05-03 17:13:26 $
+ *  last change: $Author: ssa $ $Date: 2002-05-16 11:21:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2252,7 +2252,7 @@ USHORT PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, ULONG nPopupM
     }
     else if ( pSVData->maAppData.mbAutoMnemonics && !( nMenuFlags & MENU_FLAG_NOAUTOMNEMONICS ) )
     {
-        ImplMnemonicGenerator aMnemonicGenerator;
+        MnemonicGenerator aMnemonicGenerator;
         ULONG n;
         for ( n = 0; n < pItemList->Count(); n++ )
             aMnemonicGenerator.RegisterMnemonic( pItemList->GetDataFromPos(n)->aText );
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index 4d303778624d..a38812f782c1 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: mnemonic.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: pl $ $Date: 2002-03-26 11:58:46 $
+ *  last change: $Author: ssa $ $Date: 2002-05-16 11:22:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,14 +77,14 @@ using namespace ::com::sun::star;
 
 // =======================================================================
 
-ImplMnemonicGenerator::ImplMnemonicGenerator()
+MnemonicGenerator::MnemonicGenerator()
 {
     memset( maMnemonics, 1, sizeof( maMnemonics ) );
 }
 
 // -----------------------------------------------------------------------
 
-USHORT ImplMnemonicGenerator::ImplGetMnemonicIndex( sal_Unicode c )
+USHORT MnemonicGenerator::ImplGetMnemonicIndex( sal_Unicode c )
 {
     static USHORT const aImplMnemonicRangeTab[MNEMONIC_RANGES*2] =
     {
@@ -109,7 +109,7 @@ USHORT ImplMnemonicGenerator::ImplGetMnemonicIndex( sal_Unicode c )
 
 // -----------------------------------------------------------------------
 
-sal_Unicode ImplMnemonicGenerator::ImplFindMnemonic( const XubString& rKey )
+sal_Unicode MnemonicGenerator::ImplFindMnemonic( const XubString& rKey )
 {
     xub_StrLen nIndex = 0;
     while ( (nIndex = rKey.Search( MNEMONIC_CHAR, nIndex )) != STRING_NOTFOUND )
@@ -125,7 +125,7 @@ sal_Unicode ImplMnemonicGenerator::ImplFindMnemonic( const XubString& rKey )
 
 // -----------------------------------------------------------------------
 
-void ImplMnemonicGenerator::RegisterMnemonic( const XubString& rKey )
+void MnemonicGenerator::RegisterMnemonic( const XubString& rKey )
 {
     const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILocale();
     uno::Reference < i18n::XCharacterClassification > xCharClass = GetCharClass();
@@ -164,7 +164,7 @@ void ImplMnemonicGenerator::RegisterMnemonic( const XubString& rKey )
 
 // -----------------------------------------------------------------------
 
-BOOL ImplMnemonicGenerator::CreateMnemonic( XubString& rKey )
+BOOL MnemonicGenerator::CreateMnemonic( XubString& rKey )
 {
     if ( !rKey.Len() || ImplFindMnemonic( rKey ) )
         return FALSE;
@@ -340,7 +340,7 @@ BOOL ImplMnemonicGenerator::CreateMnemonic( XubString& rKey )
 
 // -----------------------------------------------------------------------
 
-uno::Reference< i18n::XCharacterClassification > ImplMnemonicGenerator::GetCharClass()
+uno::Reference< i18n::XCharacterClassification > MnemonicGenerator::GetCharClass()
 {
     if ( !xCharClass.is() )
         xCharClass = vcl::unohelper::CreateCharacterClassification();