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/awt/UnoControlFixedHyperlinkModel.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/awt/UnoControlFixedHyperlinkModel.idl')
-rw-r--r-- | offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl b/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl index e4a6bd3dbd58..e7e200211e3f 100644 --- a/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl +++ b/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl @@ -27,21 +27,10 @@ #ifndef __com_sun_star_awt_UnoControlFixedHyperlinkModel_idl__ #define __com_sun_star_awt_UnoControlFixedHyperlinkModel_idl__ -#ifndef __com_sun_star_awt_FontDescriptor_idl__ #include <com/sun/star/awt/FontDescriptor.idl> -#endif - -#ifndef __com_sun_star_awt_UnoControlModel_idl__ #include <com/sun/star/awt/UnoControlModel.idl> -#endif - -#ifndef __com_sun_star_style_VerticalAlignment_idl__ #include <com/sun/star/style/VerticalAlignment.idl> -#endif - -#ifndef __com_sun_star_util_Color_idl__ #include <com/sun/star/util/Color.idl> -#endif //============================================================================= |