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

Cleaning: remove use of old edt1 from dlg.h (Windows)

Browse Source 
edt1 was used before cmb13 (used from Win2K version)
So use only cmb13 + tweaks associated comments
See http://nabble.documentfoundation.org/Cppcheck-reassignment-of-edt1Id-because-isWin2000-has-been-removed-fpicker-module-td4061342.html

Change-Id: I9d56726508a9fbf2607c9d18b7b33eca340f1b9f
Reviewed-on: https://gerrit.libreoffice.org/4283
Tested-by: Andras Timar <atimar@suse.com>
Reviewed-by: Andras Timar <atimar@suse.com>
This commit is contained in:
Julien Nabet
2013-06-14 17:43:34 +02:00
committed by Andras Timar
parent 99eee227ac
commit e9fd9c2526
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
View File

@@ -584,7 +584,7 @@ void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)
// Our approach is to align all static text controls with the // Our approach is to align all static text controls with the
// static text control "File name" of the FileOpen dialog, // static text control "File name" of the FileOpen dialog,
// all checkboxes and all list/comboboxes will be left aligned with // all checkboxes and all list/comboboxes will be left aligned with
// the standard combobox edt1 (defined in MS platform sdk dlgs.h) // the standard combobox cmb13 (defined in MS platform sdk dlgs.h)
// and all push buttons will be left aligned with the standard // and all push buttons will be left aligned with the standard
// "OK" button // "OK" button
//----------------------------------------------------------------- //-----------------------------------------------------------------
@@ -689,8 +689,6 @@ void CWinFileOpenImpl::EnlargeStdControlLabels() const
HWND hFilterBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc2); HWND hFilterBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc2);
HWND hFileNameBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc3); HWND hFileNameBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc3);
HWND hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, cmb13); HWND hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, cmb13);
if (!hFileNameBox)
hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, edt1); // under Win98 it is edt1 instead of cmb13
HWND hFilterBox = GetDlgItem(m_hwndFileOpenDlg, cmb1); HWND hFilterBox = GetDlgItem(m_hwndFileOpenDlg, cmb1);
HWND hOkButton = GetDlgItem(m_hwndFileOpenDlg, IDOK); HWND hOkButton = GetDlgItem(m_hwndFileOpenDlg, IDOK);
@@ -985,15 +983,11 @@ void SAL_CALL CWinFileOpenImpl::InitialSetDefaultName()
// open dialog (reason: see above setDefaultName) // open dialog (reason: see above setDefaultName)
if (m_bInitialSelChanged && m_defaultName.getLength()) if (m_bInitialSelChanged && m_defaultName.getLength())
{ {
sal_Int32 edt1Id = edt1; // from W2k there is a combobox instead
// under W2k the there is a combobox instead
// of an edit field for the file name edit field // of an edit field for the file name edit field
// the control id of this box is cmb13 and not // So the control id of this box is cmb13 and not
// edt1 as before so we must use this id // edt1 as before
edt1Id = cmb13; HWND hwndEdt1 = GetDlgItem(m_hwndFileOpenDlg, cmb13);
HWND hwndEdt1 = GetDlgItem(m_hwndFileOpenDlg, edt1Id);
SetWindowText(hwndEdt1, reinterpret_cast<LPCTSTR>(m_defaultName.getStr())); SetWindowText(hwndEdt1, reinterpret_cast<LPCTSTR>(m_defaultName.getStr()));
} }