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 | fd0649408ac52ec0c6a443c5716d50c9243bca7e (patch) | |
tree | 5c5472ebd37157ec38bef497ddad7c8fa4acfbba /offapi/com/sun/star/text/Footnote.idl | |
parent | ea3da31396ff5a1d88efdbd6e53f2c1b1794ccb0 (diff) | |
parent | 1247c8b2350734c4f16bbc15404c3c7d56bf8523 (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
xmlreader/prj/d.lst
Diffstat (limited to 'offapi/com/sun/star/text/Footnote.idl')
-rw-r--r-- | offapi/com/sun/star/text/Footnote.idl | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/offapi/com/sun/star/text/Footnote.idl b/offapi/com/sun/star/text/Footnote.idl index df126fbe1..968535b05 100644 --- a/offapi/com/sun/star/text/Footnote.idl +++ b/offapi/com/sun/star/text/Footnote.idl @@ -27,13 +27,8 @@ #ifndef __com_sun_star_text_Footnote_idl__ #define __com_sun_star_text_Footnote_idl__ -#ifndef __com_sun_star_text_XFootnote_idl__ #include <com/sun/star/text/XFootnote.idl> -#endif - -#ifndef __com_sun_star_text_XText_idl__ #include <com/sun/star/text/XText.idl> -#endif //============================================================================= |