Kaydet (Commit) 852bf3ad authored tarafından Ariel Constenla-Haile's avatar Ariel Constenla-Haile Kaydeden (comit) Caolán McNamara

Resolves: #i120571# Enhancements in "Save/Load Keyboard Config" dialog

(cherry picked from commit fe75dbb7)

Conflicts:
	cui/source/customize/acccfg.cxx

Change-Id: I967ed2b4b7b3c9dfeebf07af544216afc8bead8d
üst 74970948
...@@ -1387,7 +1387,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl) ...@@ -1387,7 +1387,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl)
void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTitle ) void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTitle )
{ {
bool bSave = ( ( nBits & WB_SAVEAS ) == WB_SAVEAS ); bool bSave = ( ( nBits & WB_SAVEAS ) == WB_SAVEAS );
short nDialogType = bSave ? css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE short nDialogType = bSave ? css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION
: css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE; : css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE;
if ( m_pFileDlg ) if ( m_pFileDlg )
delete m_pFileDlg; delete m_pFileDlg;
...@@ -1396,6 +1396,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTi ...@@ -1396,6 +1396,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTi
m_pFileDlg->SetTitle( rTitle ); m_pFileDlg->SetTitle( rTitle );
m_pFileDlg->AddFilter( aFilterAllStr, OUString(FILEDIALOG_FILTER_ALL) ); m_pFileDlg->AddFilter( aFilterAllStr, OUString(FILEDIALOG_FILTER_ALL) );
m_pFileDlg->AddFilter( aFilterCfgStr, OUString("*.cfg") ); m_pFileDlg->AddFilter( aFilterCfgStr, OUString("*.cfg") );
m_pFileDlg->SetCurrentFilter( aFilterCfgStr );
Link aDlgClosedLink = bSave ? LINK( this, SfxAcceleratorConfigPage, SaveHdl ) Link aDlgClosedLink = bSave ? LINK( this, SfxAcceleratorConfigPage, SaveHdl )
: LINK( this, SfxAcceleratorConfigPage, LoadHdl ); : LINK( this, SfxAcceleratorConfigPage, LoadHdl );
......
...@@ -193,7 +193,7 @@ TabPage RID_SVXPAGE_KEYBOARD ...@@ -193,7 +193,7 @@ TabPage RID_SVXPAGE_KEYBOARD
}; };
String STR_FILTERNAME_CFG String STR_FILTERNAME_CFG
{ {
Text [ en-US ] = "Configuration" ; Text [ en-US ] = "Configuration (*.cfg)" ;
}; };
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment