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

rename ImplWindowAutoMnemonic and expose

Browse Source 
Change-Id: Iddb0d84b6dbfeb263a68ddc3b8b5c39bbdcf46f6
This commit is contained in:
Caolán McNamara
2016-07-30 21:53:56 +01:00
parent ff4217e9e4
commit 76be678e74
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/vcl/accel.hxx
View File

@@ -82,6 +82,7 @@ public:
Accelerator& operator=( const Accelerator& rAccel ); Accelerator& operator=( const Accelerator& rAccel );
static bool ToggleMnemonicsOnHierarchy(const CommandEvent& rCEvent, vcl::Window *pWindow); static bool ToggleMnemonicsOnHierarchy(const CommandEvent& rCEvent, vcl::Window *pWindow);
static void GenerateAutoMnemonicsOnHierarchy(vcl::Window* pWindow);
}; };
#endif // INCLUDED_VCL_ACCEL_HXX #endif // INCLUDED_VCL_ACCEL_HXX

1
vcl/inc/svdata.hxx
View File

@@ -349,7 +349,6 @@ VCL_PLUGIN_PUBLIC ResMgr* ImplGetResMgr();
VCL_PLUGIN_PUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if no res mgr VCL_PLUGIN_PUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if no res mgr
DockingManager* ImplGetDockingManager(); DockingManager* ImplGetDockingManager();
BlendFrameCache* ImplGetBlendFrameCache(); BlendFrameCache* ImplGetBlendFrameCache();
void ImplWindowAutoMnemonic( vcl::Window* pWindow );
bool ImplCallHotKey( const vcl::KeyCode& rKeyCode ); bool ImplCallHotKey( const vcl::KeyCode& rKeyCode );
void ImplFreeHotKeyData(); void ImplFreeHotKeyData();

2
vcl/source/window/dialog.cxx
View File

@@ -189,7 +189,7 @@ vcl::Window * firstLogicalChildOfParent(vcl::Window *pTopLevel)
return pChild; return pChild;
} }
void ImplWindowAutoMnemonic( vcl::Window* pWindow ) void Accelerator::GenerateAutoMnemonicsOnHierarchy(vcl::Window* pWindow)
{ {
MnemonicGenerator aMnemonicGenerator; MnemonicGenerator aMnemonicGenerator;
vcl::Window* pGetChild; vcl::Window* pGetChild;

4
vcl/source/window/dockwin.cxx
View File

@@ -697,8 +697,8 @@ void DockingWindow::Resizing( Size& )
void DockingWindow::DoInitialLayout() void DockingWindow::DoInitialLayout()
{ {
if ( GetSettings().GetStyleSettings().GetAutoMnemonic() ) if (GetSettings().GetStyleSettings().GetAutoMnemonic())
ImplWindowAutoMnemonic( this ); Accelerator::GenerateAutoMnemonicsOnHierarchy(this);
if (isLayoutEnabled()) if (isLayoutEnabled())
{ {

4
vcl/source/window/syswin.cxx
View File

@@ -1152,8 +1152,8 @@ void SystemWindow::setOptimalLayoutSize()
void SystemWindow::DoInitialLayout() void SystemWindow::DoInitialLayout()
{ {
if ( GetSettings().GetStyleSettings().GetAutoMnemonic() ) if (GetSettings().GetStyleSettings().GetAutoMnemonic())
ImplWindowAutoMnemonic( this ); Accelerator::GenerateAutoMnemonicsOnHierarchy(this);
if (isLayoutEnabled()) if (isLayoutEnabled())
{ {

4
vcl/source/window/tabpage.cxx
View File

@@ -104,8 +104,8 @@ void TabPage::StateChanged( StateChangedType nType )
if ( nType == StateChangedType::InitShow ) if ( nType == StateChangedType::InitShow )
{ {
if ( GetSettings().GetStyleSettings().GetAutoMnemonic() ) if (GetSettings().GetStyleSettings().GetAutoMnemonic())
ImplWindowAutoMnemonic( this ); Accelerator::GenerateAutoMnemonicsOnHierarchy(this);
// FIXME: no layouting, workaround some clipping issues // FIXME: no layouting, workaround some clipping issues
ImplAdjustNWFSizes(); ImplAdjustNWFSizes();
} }