rebase XFormatCondition, XFormattedField, XFunction, XGroup, ....

XImageControl, XReportControlModel, XREportDefinition

Change-Id: I2c075de49b0b057917db7de5e997dbc1c2a13578

14 files changed, 142 insertions, 334 deletions

diff --git a/offapi/com/sun/star/report/FormatCondition.idl b/offapi/com/sun/star/report/FormatCondition.idl
deleted file mode 100644
index 58a43af66a6d..000000000000
--- a/offapi/com/sun/star/report/FormatCondition.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __com_sun_star_report_FormatCondition_idl__
-#define __com_sun_star_report_FormatCondition_idl__
-
-#include <com/sun/star/report/XFormatCondition.idl>
-
- module com {  module sun {  module star {  module report {
-
-service FormatCondition : XFormatCondition;
-
-}; }; }; };
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/FormattedField.idl b/offapi/com/sun/star/report/FormattedField.idl
deleted file mode 100644
index d39792257bc9..000000000000
--- a/offapi/com/sun/star/report/FormattedField.idl
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __com_sun_star_report_FormattedField_idl__
-#define __com_sun_star_report_FormattedField_idl__
-
-#include <com/sun/star/report/XFormattedField.idl>
-
-
- module com {  module sun {  module star {  module report {
-
-
-service FormattedField : XFormattedField;
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/Function.idl b/offapi/com/sun/star/report/Function.idl
deleted file mode 100644
index f070e817d91d..000000000000
--- a/offapi/com/sun/star/report/Function.idl
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __com_sun_star_report_Function_idl__
-#define __com_sun_star_report_Function_idl__
-
-#include <com/sun/star/report/XFunction.idl>
-
- module com {  module sun {  module star {  module report {
-
-service Function : XFunction
-{
-    create();
-};
-
-}; }; }; };
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/Group.idl b/offapi/com/sun/star/report/Group.idl
deleted file mode 100644
index 4fd241b7df7b..000000000000
--- a/offapi/com/sun/star/report/Group.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __com_sun_star_report_Group_idl__
-#define __com_sun_star_report_Group_idl__
-
-#include <com/sun/star/report/XGroup.idl>
-
-
- module com {  module sun {  module star {  module report {
-
-service Group : XGroup;
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/ImageControl.idl b/offapi/com/sun/star/report/ImageControl.idl
deleted file mode 100644
index fac09c11edf4..000000000000
--- a/offapi/com/sun/star/report/ImageControl.idl
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __com_sun_star_report_ImageControl_idl__
-#define __com_sun_star_report_ImageControl_idl__
-
-#include <com/sun/star/report/XImageControl.idl>
-
-
- module com {  module sun {  module star {  module report {
-
-
-service ImageControl : XImageControl;
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/ReportControlModel.idl b/offapi/com/sun/star/report/ReportControlModel.idl
deleted file mode 100644
index e234ad207dc2..000000000000
--- a/offapi/com/sun/star/report/ReportControlModel.idl
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __com_sun_star_report_ReportControlModel_idl__
-#define __com_sun_star_report_ReportControlModel_idl__
-
-#include <com/sun/star/report/XReportControlModel.idl>
-
-
- module com {  module sun {  module star {  module report {
-
-
-service ReportControlModel : XReportControlModel;
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/ReportDefinition.idl b/offapi/com/sun/star/report/ReportDefinition.idl
deleted file mode 100644
index 8b10400a3e78..000000000000
--- a/offapi/com/sun/star/report/ReportDefinition.idl
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __com_sun_star_report_ReportDefinition_idl__
-#define __com_sun_star_report_ReportDefinition_idl__
-
-#include <com/sun/star/report/XReportDefinition.idl>
-
-
- module com {  module sun {  module star {  module report {
-
-
-service ReportDefinition : XReportDefinition;
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/XFormatCondition.idl b/offapi/com/sun/star/report/XFormatCondition.idl
index aab255e02205..12f137a91e6e 100644
--- a/offapi/com/sun/star/report/XFormatCondition.idl
+++ b/offapi/com/sun/star/report/XFormatCondition.idl
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -16,15 +15,20 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #ifndef __com_sun_star_report_XFormatCondition_idl__
 #define __com_sun_star_report_XFormatCondition_idl__
 
+#ifndef __com_sun_star_report_XReportControlFormat_idl__
 #include <com/sun/star/report/XReportControlFormat.idl>
+#endif
 
+//=============================================================================
  module com {  module sun {  module star {  module report {
+//=============================================================================
 /** specifies a format condition for a control.
 */
-interface XFormatCondition
+published interface XFormatCondition
 {
     interface XReportControlFormat;
 
@@ -42,8 +46,8 @@ interface XFormatCondition
     [attribute,bound] string Formula;
 };
 
+service FormatCondition : XFormatCondition;
+//=============================================================================
 
 }; }; }; };
 #endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/XFormattedField.idl b/offapi/com/sun/star/report/XFormattedField.idl
index 8d668a2dee0c..e36deb29dc33 100644
--- a/offapi/com/sun/star/report/XFormattedField.idl
+++ b/offapi/com/sun/star/report/XFormattedField.idl
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -16,21 +15,28 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #ifndef __com_sun_star_report_XFormattedField_idl__
 #define __com_sun_star_report_XFormattedField_idl__
 
+#ifndef __com_sun_star_report_XReportControlModel_idl__
 #include <com/sun/star/report/XReportControlModel.idl>
+#endif
+#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
+#endif
 
+//=============================================================================
 
  module com {  module sun {  module star {  module report {
 
+//=============================================================================
 /** describes a control which can be used for displaying values with a arbitrary formatting.
 
     @see com::sun::star::report::XReportControlModel
     @see com::sun::star::util::XNumberFormatsSupplier
 */
-interface XFormattedField
+published interface XFormattedField
 {
     interface XReportControlModel;
 
@@ -47,9 +53,12 @@ interface XFormattedField
     [attribute,bound] com::sun::star::util::XNumberFormatsSupplier FormatsSupplier;
 };
 
+published service FormattedField : XFormattedField;
+//=============================================================================
 
 }; }; }; };
 
-#endif
+/*=============================================================================
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/XFunction.idl b/offapi/com/sun/star/report/XFunction.idl
index 08f5808a9dba..3937a89c911f 100644
--- a/offapi/com/sun/star/report/XFunction.idl
+++ b/offapi/com/sun/star/report/XFunction.idl
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -16,17 +15,28 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #ifndef __com_sun_star_report_XFunction_idl__
 #define __com_sun_star_report_XFunction_idl__
 
+#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
+#endif
+#ifndef __com_sun_star_beans_Optional_idl__
 #include <com/sun/star/beans/Optional.idl>
+#endif
+#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
+#endif
+#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
+#endif
+//=============================================================================
  module com {  module sun {  module star {  module report {
+//=============================================================================
 /** specifies a format condition for a control.
 */
-interface XFunction
+published interface XFunction
 {
     /** gives access to the properties.
     */
@@ -53,17 +63,20 @@ interface XFunction
     */
     [attribute,bound] string Name;
 
-    /** defines the formula of this function
+    /** defines the formular of this function
     */
     [attribute,bound] string Formula;
 
-    /** defines the formula for the initial value
+    /** defines the formular for the intial value
     */
     [attribute,bound] com::sun::star::beans::Optional<string> InitialFormula;
 };
 
+service Function : XFunction
+{
+    create();
+};
+//=============================================================================
 
 }; }; }; };
 #endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/XGroup.idl b/offapi/com/sun/star/report/XGroup.idl
index 9fb409b6279a..7a7893b01d15 100644
--- a/offapi/com/sun/star/report/XGroup.idl
+++ b/offapi/com/sun/star/report/XGroup.idl
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -16,23 +15,32 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #ifndef __com_sun_star_report_XGroup_idl__
 #define __com_sun_star_report_XGroup_idl__
 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
+#endif
+#ifndef __com_sun_star_report_XSection_idl__
 #include <com/sun/star/report/XSection.idl>
+#endif
+#ifndef __com_sun_star_report_XGroups_idl__
 #include <com/sun/star/report/XGroups.idl>
+#endif
 #include <com/sun/star/report/XFunctions.idl>
+//=============================================================================
 
  module com {  module sun {  module star {  module report {
 
+//=============================================================================
 
 /** identifies a <type>XGroup</type>.
     A group is always a child of the groups collection in the report.
     @see XReportDefinition
     @see XGroups
  */
-interface XGroup
+published interface XGroup
 {
     /** allows access to the groups collection of the report.
     */
@@ -122,9 +130,12 @@ interface XGroup
     [attribute,bound] boolean ResetPageNumber;
 };
 
+service Group : XGroup;
+//=============================================================================
 
 }; }; }; };
 
-#endif
+/*=============================================================================
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/XImageControl.idl b/offapi/com/sun/star/report/XImageControl.idl
index 0bb3ca9fca32..86e1154d9a34 100644
--- a/offapi/com/sun/star/report/XImageControl.idl
+++ b/offapi/com/sun/star/report/XImageControl.idl
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -16,16 +15,23 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #ifndef __com_sun_star_report_XImageControl_idl__
 #define __com_sun_star_report_XImageControl_idl__
 
+#ifndef __com_sun_star_report_XReportControlModel_idl__
 #include <com/sun/star/report/XReportControlModel.idl>
+#endif
+#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
 #include <com/sun/star/form/XImageProducerSupplier.idl>
+#endif
 
+//=============================================================================
 
  module com {  module sun {  module star {  module report {
 
-interface XImageControl
+//=============================================================================
+published interface XImageControl
 {
     interface XReportControlModel;
 
@@ -67,9 +73,12 @@ interface XImageControl
     [attribute,bound] boolean PreserveIRI;
 };
 
+published service ImageControl : XImageControl;
+//=============================================================================
 
 }; }; }; };
 
-#endif
+/*=============================================================================
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/XReportControlModel.idl b/offapi/com/sun/star/report/XReportControlModel.idl
index ece9a7824750..c735a9f5b94b 100644
--- a/offapi/com/sun/star/report/XReportControlModel.idl
+++ b/offapi/com/sun/star/report/XReportControlModel.idl
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -16,18 +15,31 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #ifndef __com_sun_star_report_XReportControlModel_idl__
 #define __com_sun_star_report_XReportControlModel_idl__
 
+#ifndef __com_sun_star_report_XReportComponent_idl__
 #include <com/sun/star/report/XReportComponent.idl>
+#endif
+#ifndef __com_sun_star_report_XReportControlFormat_idl__
 #include <com/sun/star/report/XReportControlFormat.idl>
+#endif
+#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
+#endif
+#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
+#endif
+#ifndef __com_sun_star_report_XFormatCondition_idl__
 #include <com/sun/star/report/XFormatCondition.idl>
+#endif
+//=============================================================================
 
  module com {  module sun {  module star {  module report {
 
-interface XReportControlModel
+//=============================================================================
+published interface XReportControlModel
 {
     /** allows the creation of sub reports.
     */
@@ -84,9 +96,12 @@ interface XReportControlModel
     };
 };
 
+service ReportControlModel : XReportControlModel;
+//=============================================================================
 
 }; }; }; };
 
-#endif
+/*=============================================================================
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/XReportDefinition.idl b/offapi/com/sun/star/report/XReportDefinition.idl
index 9d6570080975..f1b438d7007f 100644
--- a/offapi/com/sun/star/report/XReportDefinition.idl
+++ b/offapi/com/sun/star/report/XReportDefinition.idl
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -16,37 +15,78 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #ifndef __com_sun_star_report_XReportDefinition_idl__
 #define __com_sun_star_report_XReportDefinition_idl__
 
+#ifndef __com_sun_star_report_XReportComponent_idl__
 #include <com/sun/star/report/XReportComponent.idl>
+#endif
+#ifndef __com_sun_star_report_XFunctionsSupplier_idl__
 #include <com/sun/star/report/XFunctionsSupplier.idl>
+#endif
+#ifndef __com_sun_star_view_PaperOrientation_idl__
 #include <com/sun/star/view/PaperOrientation.idl>
+#endif
+#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
+#endif
+#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
+#endif
+#ifndef __com_sun_star_view_PaperFormat_idl__
 #include <com/sun/star/view/PaperFormat.idl>
+#endif
+#ifndef __com_sun_star_util_XClosable_idl__
 #include <com/sun/star/util/XCloseable.idl>
+#endif
+#ifndef __com_sun_star_ui_XUIConfigurationManagerSupplier_idl__
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.idl>
+#endif
+#ifndef __com_sun_star_document_XDocumentSubStorageSupplier_idl__
 #include <com/sun/star/document/XDocumentSubStorageSupplier.idl>
+#endif
+#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
+#endif
+#ifndef __com_sun_star_document_XViewDataSupplier_idl__
 #include <com/sun/star/document/XViewDataSupplier.idl>
+#endif
+#ifndef __com_sun_star_frame_XLoadable_idl__
 #include <com/sun/star/frame/XLoadable.idl>
+#endif
+#ifndef __com_sun_star_embed_XVisualObject_idl__
 #include <com/sun/star/embed/XVisualObject.idl>
+#endif
+#ifndef __com_sun_star_embed_XStorageBasedDocument_idl__
 #include <com/sun/star/document/XStorageBasedDocument.idl>
+#endif
+#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
+#endif
+#ifndef __com_sun_star_util_XModifiable2_idl__
 #include <com/sun/star/util/XModifiable2.idl>
+#endif
+#ifndef __com_sun_star_document_XEventBroadcaster_idl__
 #include <com/sun/star/document/XEventBroadcaster.idl>
+#endif
+#ifndef __com_sun_star_lang_DisposedException_idl__
 #include <com/sun/star/lang/DisposedException.idl>
+#endif
+#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
 #include <com/sun/star/style/XStyleFamiliesSupplier.idl>
+#endif
 
 module com {  module sun {  module star {  module sdbc {
 published interface XConnection;
 };};};};
+//=============================================================================
 
  module com {  module sun {  module star {  module report {
 
-     interface XSection;
-     interface XGroups;
+     published interface XSection;
+     published interface XGroups;
+//=============================================================================
 
 /** identifies a <type>XReportComponent</type> as being a (sub-) report.
 
@@ -59,7 +99,7 @@ published interface XConnection;
 
     @see XReportComponent
  */
-interface XReportDefinition
+published interface XReportDefinition
 {
     /** allows the access to the model embedded in the database storage.
     */
@@ -69,7 +109,7 @@ interface XReportDefinition
     */
     interface com::sun::star::frame::XLoadable;
 
-    /** represents common visualization functionality for the embedded report.
+    /** represents common visualisation functionality for the embedded report.
     */
     interface com::sun::star::embed::XVisualObject;
 
@@ -98,11 +138,12 @@ interface XReportDefinition
      */
     interface com::sun::star::style::XStyleFamiliesSupplier;
 
+    //-------------------------------------------------------------------------
     /** a storable document should provide information about his modify state
 
         <p>
         With this interface it's possible too, to reset the modify state.
-        That can be necessary to prevent code against problem during closing
+        That can be neccessary to prevent code against problem during closing
         of the document without saving any changes.
         </p>
      */
@@ -132,6 +173,7 @@ interface XReportDefinition
         raises( ::com::sun::star::lang::DisposedException,
                 ::com::sun::star::uno::Exception );
 
+    //-------------------------------------------------------------------------
 
     /** Represents the output format (media (mime) type) of the resulting document when executing this report.
     */
@@ -184,14 +226,14 @@ interface XReportDefinition
 
         <p><member>Command</member> needs to be interpreted depending on the value of this property.</p>
 
-        <p>This property is only meaningful together with the <member>Command</member>
+        <p>This property is only meaningfull together with the <member>Command</member>
         property, thus either <em>both</em> or <em>none</em> of them are present.</p>
 
         @see com::sun::star::sdb::CommandType
      */
     [attribute,bound] long CommandType;
 
-    /** specifies an additional filter to optionally use.
+    /** specifies an addtional filter to optinally use.
 
         <p>The Filter string has to form a SQL WHERE-clause, <em>without</em> the WHERE-string itself.</p>
 
@@ -301,9 +343,12 @@ interface XReportDefinition
     };
 };
 
+published service ReportDefinition : XReportDefinition;
+//=============================================================================
 
 }; }; }; };
 
-#endif
+/*=============================================================================
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+=============================================================================*/
+#endif