diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-02-04 13:18:58 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-02-04 13:18:58 +0000 |
commit | 48675d16041a8cc5cd29678f2587263b0460122f (patch) | |
tree | 434af9d5fbe327c4c9bbc4aa58ba728f9aeed5a5 /fpicker | |
parent | b3fbdaabf9272e5e19b5d0e7c81c5ff9c8481120 (diff) |
INTEGRATION: CWS autoextension01_SRC680 (1.13.24); FILE MERGED
2008/01/21 14:52:02 as 1.13.24.1: #cwsaddtask i85044#
Diffstat (limited to 'fpicker')
-rw-r--r-- | fpicker/source/win32/filepicker/filepickerstate.cxx | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx index 1c089452647e..b0d9f3ad4b17 100644 --- a/fpicker/source/win32/filepicker/filepickerstate.cxx +++ b/fpicker/source/win32/filepicker/filepickerstate.cxx @@ -4,9 +4,9 @@ * * $RCSfile: filepickerstate.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: ihi $ $Date: 2007-11-19 16:26:57 $ + * last change: $Author: ihi $ $Date: 2008-02-04 14:18:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -417,10 +417,6 @@ void SAL_CALL CExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16 if ( com::sun::star::ui::dialogs::ControlActions::SET_HELP_URL == aControlAction ) return; - // #i78850# ignore requests for "AutoExtension" control - if ( com::sun::star::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION == aControlId ) - return; - HWND hwndCtrl = GetHwndDlgItem( aControlId ); // the filter listbox can be manipulated via this @@ -463,10 +459,6 @@ Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16 if ( com::sun::star::ui::dialogs::ControlActions::GET_HELP_URL == aControlAction ) return Any( ); - // #i78850# ignore requests for "AutoExtension" control - if ( com::sun::star::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION == aControlId ) - return Any( ); - HWND hwndCtrl = GetHwndDlgItem( aControlId ); // the filter listbox can be manipulated via this @@ -502,10 +494,6 @@ Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16 void SAL_CALL CExecuteFilePickerState::enableControl( sal_Int16 aControlId, sal_Bool bEnable ) { - // #i78850# ignore requests for "AutoExtension" control - if ( com::sun::star::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION == aControlId ) - return; - HWND hwndCtrl = GetHwndDlgItem( aControlId ); OSL_ENSURE( IsWindow( hwndCtrl ), "invalid element id"); @@ -519,10 +507,6 @@ void SAL_CALL CExecuteFilePickerState::enableControl( sal_Int16 aControlId, sal_ void SAL_CALL CExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUString& aLabel ) { - // #i78850# ignore requests for "AutoExtension" control - if ( com::sun::star::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION == aControlId ) - return; - HWND hwndCtrl = GetHwndDlgItem( aControlId ); OSL_ENSURE( IsWindow( hwndCtrl ), "invalid element id"); @@ -543,10 +527,6 @@ void SAL_CALL CExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUS OUString SAL_CALL CExecuteFilePickerState::getLabel( sal_Int16 aControlId ) { - // #i78850# ignore requests for "AutoExtension" control - if ( com::sun::star::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION == aControlId ) - return ::rtl::OUString( ); - HWND hwndCtrl = GetHwndDlgItem( aControlId ); OSL_ENSURE( IsWindow( hwndCtrl ), "invalid element id"); |