diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:57:43 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:57:43 +0200 |
| commit | a82eae375ecc76c25bb2172424d22bfe479e28d1 (patch) | |
| tree | 99fcf65104c29bd4ef436653b4a361f46789b4e7 /offapi/com/sun/star/form/component/ComboBox.idl | |
| parent | a64d0f306856ede0265937969ab5ae0754076ac4 (diff) | |
| parent | 08a08dec6e62da86b8e1746bb205cb32ee4c7f98 (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
xmlreader/prj/d.lst
Diffstat (limited to 'offapi/com/sun/star/form/component/ComboBox.idl')
| -rw-r--r-- | offapi/com/sun/star/form/component/ComboBox.idl | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/offapi/com/sun/star/form/component/ComboBox.idl b/offapi/com/sun/star/form/component/ComboBox.idl index c5d02077cad8..7b3155703838 100644 --- a/offapi/com/sun/star/form/component/ComboBox.idl +++ b/offapi/com/sun/star/form/component/ComboBox.idl @@ -27,17 +27,11 @@ #ifndef __com_sun_star_form_component_ComboBox_idl__ #define __com_sun_star_form_component_ComboBox_idl__ -#ifndef __com_sun_star_awt_UnoControlComboBoxModel_idl__ #include <com/sun/star/awt/UnoControlComboBoxModel.idl> -#endif -#ifndef __com_sun_star_form_FormControlModel_idl__ #include <com/sun/star/form/FormControlModel.idl> -#endif -#ifndef __com_sun_star_form_XReset_idl__ #include <com/sun/star/form/XReset.idl> -#endif //============================================================================= |