[Libreoffice-commits] .: 7 commits - dbaccess/source desktop/source extensions/source forms/source framework/inc framework/source offapi/com offapi/org offapi/UnoApi_offapi.mk reportdesign/source sw/source udkapi/com

Thu Dec 20 23:12:41 PST 2012

dbaccess/source/ui/uno/composerdialogs.cxx                                 |   19 ++
 dbaccess/source/ui/uno/composerdialogs.hxx                                 |    3 
 desktop/source/app/app.cxx                                                 |   26 +--
 extensions/source/bibliography/framectr.cxx                                |   55 +-------
 extensions/source/propctrlr/formcomponenthandler.cxx                       |   18 +-
 forms/source/runtime/formoperations.cxx                                    |   46 +++---
 framework/inc/helper/mischelper.hxx                                        |    2 
 framework/inc/services.h                                                   |    3 
 framework/inc/uielement/menubarmanager.hxx                                 |    3 
 framework/inc/uifactory/toolbarcontrollerfactory.hxx                       |   10 -
 framework/source/fwi/helper/mischelper.cxx                                 |   12 -
 framework/source/uiconfiguration/imagemanager.cxx                          |    2 
 framework/source/uiconfiguration/imagemanagerimpl.cxx                      |   29 ++--
 framework/source/uiconfiguration/imagemanagerimpl.hxx                      |   10 -
 framework/source/uiconfiguration/moduleimagemanager.cxx                    |    2 
 framework/source/uielement/macrosmenucontroller.cxx                        |    2 
 framework/source/uielement/menubarmanager.cxx                              |   67 ++++------
 framework/source/uielement/popupmenucontroller.cxx                         |    9 -
 framework/source/uielement/statusbarmanager.cxx                            |    2 
 framework/source/uielement/toolbarmanager.cxx                              |   12 -
 framework/source/uielement/toolbarsmenucontroller.cxx                      |    5 
 framework/source/uielement/uicommanddescription.cxx                        |    2 
 framework/source/uifactory/popupmenucontrollerfactory.cxx                  |    2 
 framework/source/uifactory/toolbarcontrollerfactory.cxx                    |    2 
 offapi/UnoApi_offapi.mk                                                    |    5 
 offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl       |    4 
 offapi/com/sun/star/animations/TargetPropertiesCreator.idl                 |    2 
 offapi/com/sun/star/awt/AccessibleTextField.idl                            |    4 
 offapi/com/sun/star/awt/AccessibleToolBox.idl                              |    4 
 offapi/com/sun/star/awt/ItemListEvent.idl                                  |    4 
 offapi/com/sun/star/awt/UnoControlButton.idl                               |    4 
 offapi/com/sun/star/awt/UnoControlCheckBox.idl                             |    4 
 offapi/com/sun/star/awt/UnoControlComboBox.idl                             |    4 
 offapi/com/sun/star/awt/UnoControlCurrencyField.idl                        |    4 
 offapi/com/sun/star/awt/UnoControlDateField.idl                            |    4 
 offapi/com/sun/star/awt/UnoControlFileControl.idl                          |    4 
 offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl                       |    4 
 offapi/com/sun/star/awt/UnoControlFixedLine.idl                            |    4 
 offapi/com/sun/star/awt/UnoControlFixedText.idl                            |    4 
 offapi/com/sun/star/awt/UnoControlGroupBox.idl                             |    4 
 offapi/com/sun/star/awt/UnoControlImageControl.idl                         |    4 
 offapi/com/sun/star/awt/UnoControlListBox.idl                              |    4 
 offapi/com/sun/star/awt/UnoControlPatternField.idl                         |    4 
 offapi/com/sun/star/awt/UnoControlProgressBar.idl                          |    4 
 offapi/com/sun/star/awt/UnoControlRadioButton.idl                          |    4 
 offapi/com/sun/star/awt/UnoControlScrollBar.idl                            |    4 
 offapi/com/sun/star/awt/UnoControlSpinButton.idl                           |    4 
 offapi/com/sun/star/awt/UnoControlTimeField.idl                            |    4 
 offapi/com/sun/star/awt/XItemList.idl                                      |    4 
 offapi/com/sun/star/awt/XItemListListener.idl                              |    4 
 offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl                    |    4 
 offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl                      |    4 
 offapi/com/sun/star/awt/grid/GridColumn.idl                                |    4 
 offapi/com/sun/star/awt/grid/GridSelectionEvent.idl                        |    4 
 offapi/com/sun/star/awt/grid/UnoControlGrid.idl                            |    6 
 offapi/com/sun/star/awt/grid/XGridRowSelection.idl                         |    4 
 offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl                      |    4 
 offapi/com/sun/star/chart2/Axis.idl                                        |    4 
 offapi/com/sun/star/chart2/ChartTypeManager.idl                            |    4 
 offapi/com/sun/star/chart2/ChartTypeTemplate.idl                           |    4 
 offapi/com/sun/star/chart2/Diagram.idl                                     |    4 
 offapi/com/sun/star/chart2/ErrorBar.idl                                    |    4 
 offapi/com/sun/star/chart2/FormattedString.idl                             |    4 
 offapi/com/sun/star/chart2/GridProperties.idl                              |    4 
 offapi/com/sun/star/chart2/LegendPosition.idl                              |    4 
 offapi/com/sun/star/chart2/LightSource.idl                                 |    4 
 offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl           |    4 
 offapi/com/sun/star/chart2/Title.idl                                       |    4 
 offapi/com/sun/star/chart2/XChartTypeManager.idl                           |    4 
 offapi/com/sun/star/chart2/XChartTypeTemplate.idl                          |    4 
 offapi/com/sun/star/chart2/XFormattedString.idl                            |    4 
 offapi/com/sun/star/chart2/XLegend.idl                                     |    4 
 offapi/com/sun/star/chart2/XTitle.idl                                      |    4 
 offapi/com/sun/star/chart2/XTitled.idl                                     |    4 
 offapi/com/sun/star/chart2/data/DataProvider.idl                           |    4 
 offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl                   |    4 
 offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl                  |    4 
 offapi/com/sun/star/configuration/AdministrationProvider.idl               |    4 
 offapi/com/sun/star/configuration/ReadOnlyAccess.idl                       |    4 
 offapi/com/sun/star/configuration/ReadWriteAccess.idl                      |    4 
 offapi/com/sun/star/configuration/XReadWriteAccess.idl                     |    4 
 offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl            |    4 
 offapi/com/sun/star/configuration/theDefaultProvider.idl                   |    4 
 offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl                |    4 
 offapi/com/sun/star/datatransfer/XTransferDataAccess.idl                   |    4 
 offapi/com/sun/star/deployment/DependencyException.idl                     |    4 
 offapi/com/sun/star/deployment/DeploymentException.idl                     |    4 
 offapi/com/sun/star/deployment/ExtensionManager.idl                        |    4 
 offapi/com/sun/star/deployment/ExtensionRemovedException.idl               |    4 
 offapi/com/sun/star/deployment/InstallException.idl                        |    4 
 offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl        |    4 
 offapi/com/sun/star/deployment/LicenseException.idl                        |    4 
 offapi/com/sun/star/deployment/PackageRegistryBackend.idl                  |    4 
 offapi/com/sun/star/deployment/PlatformException.idl                       |    4 
 offapi/com/sun/star/deployment/VersionException.idl                        |    4 
 offapi/com/sun/star/deployment/XExtensionManager.idl                       |    4 
 offapi/com/sun/star/deployment/XPackage.idl                                |    4 
 offapi/com/sun/star/deployment/XPackageManager.idl                         |    4 
 offapi/com/sun/star/deployment/XPackageManagerFactory.idl                  |    4 
 offapi/com/sun/star/deployment/XPackageRegistry.idl                        |    4 
 offapi/com/sun/star/deployment/XPackageTypeInfo.idl                        |    4 
 offapi/com/sun/star/deployment/thePackageManagerFactory.idl                |    4 
 offapi/com/sun/star/deployment/ui/LicenseDialog.idl                        |    4 
 offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl                 |    4 
 offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl                 |    4 
 offapi/com/sun/star/document/FilterAdapter.idl                             |    4 
 offapi/com/sun/star/document/FilterOptionsRequest.idl                      |    4 
 offapi/com/sun/star/document/XCmisDocument.idl                             |    4 
 offapi/com/sun/star/document/XDocumentRecovery.idl                         |    4 
 offapi/com/sun/star/document/XFilterAdapter.idl                            |    4 
 offapi/com/sun/star/document/XStorageBasedDocument.idl                     |    4 
 offapi/com/sun/star/document/XVbaMethodParameter.idl                       |    4 
 offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl                 |    4 
 offapi/com/sun/star/drawing/AccessibleOLEShape.idl                         |    4 
 offapi/com/sun/star/drawing/AccessibleSlideView.idl                        |    4 
 offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl                  |    4 
 offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl          |    4 
 offapi/com/sun/star/drawing/XSlideSorterBase.idl                           |   12 -
 offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl                |    4 
 offapi/com/sun/star/drawing/framework/Configuration.idl                    |    4 
 offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl                  |   14 --
 offapi/com/sun/star/form/control/CheckBox.idl                              |    4 
 offapi/com/sun/star/form/control/InteractionGridControl.idl                |    4 
 offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl            |    4 
 offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl |    4 
 offapi/com/sun/star/form/inspection/EventHandler.idl                       |    4 
 offapi/com/sun/star/form/runtime/FormController.idl                        |    4 
 offapi/com/sun/star/form/runtime/XFilterController.idl                     |    4 
 offapi/com/sun/star/form/runtime/XFormController.idl                       |    4 
 offapi/com/sun/star/form/runtime/XFormControllerContext.idl                |    4 
 offapi/com/sun/star/formula/AccessibleFormulaView.idl                      |    4 
 offapi/com/sun/star/formula/SymbolDescriptor.idl                           |    4 
 offapi/com/sun/star/frame/PopupMenuControllerFactory.idl                   |   28 ----
 offapi/com/sun/star/frame/ToolBarControllerFactory.idl                     |   41 ++++++
 offapi/com/sun/star/frame/XMenuBarAcceptor.idl                             |    4 
 offapi/com/sun/star/frame/XToolbarControllerFactory.idl                    |   65 +++++++++
 offapi/com/sun/star/frame/status/ItemStatus.idl                            |    4 
 offapi/com/sun/star/i18n/OrdinalSuffix.idl                                 |    4 
 offapi/com/sun/star/i18n/TextConversionResult.idl                          |    4 
 offapi/com/sun/star/i18n/XOrdinalSuffix.idl                                |    4 
 offapi/com/sun/star/logging/XConsoleHandler.idl                            |    4 
 offapi/com/sun/star/mozilla/XCodeProxy.idl                                 |    4 
 offapi/com/sun/star/packages/zip/ZipConstants.idl                          |    4 
 offapi/com/sun/star/rendering/ARGBColor.idl                                |    2 
 offapi/com/sun/star/rendering/BitmapCanvas.idl                             |    4 
 offapi/com/sun/star/rendering/Canvas.idl                                   |    2 
 offapi/com/sun/star/rendering/CanvasFactory.idl                            |    4 
 offapi/com/sun/star/rendering/Color.idl                                    |    2 
 offapi/com/sun/star/rendering/RGBColor.idl                                 |    2 
 offapi/com/sun/star/rendering/TexturingMode.idl                            |    4 
 offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl   |    2 
 offapi/com/sun/star/resource/StringResource.idl                            |    4 
 offapi/com/sun/star/script/ModuleSizeExceededRequest.idl                   |    4 
 offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl                   |    4 
 offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl                     |    4 
 offapi/com/sun/star/sdb/Document.idl                                       |    4 
 offapi/com/sun/star/sdb/DocumentDefinition.idl                             |    4 
 offapi/com/sun/star/sdb/FilterDialog.idl                                   |   51 +++++++
 offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl                     |    2 
 offapi/com/sun/star/sdb/application/DefaultViewController.idl              |    4 
 offapi/com/sun/star/sdb/application/XTableUIProvider.idl                   |    4 
 offapi/com/sun/star/sdb/tools/CompositionType.idl                          |    4 
 offapi/com/sun/star/sdbcx/XAlterView.idl                                   |    4 
 offapi/com/sun/star/security/CertificateContainer.idl                      |    4 
 offapi/com/sun/star/security/XCertificateContainer.idl                     |    4 
 offapi/com/sun/star/sheet/DataPilotDescriptor.idl                          |    4 
 offapi/com/sun/star/sheet/XSpreadsheets2.idl                               |    4 
 offapi/com/sun/star/sheet/XUnnamedDatabaseRanges.idl                       |   11 -
 offapi/com/sun/star/style/CharacterPropertiesComplex.idl                   |    4 
 offapi/com/sun/star/style/XStyleSupplier.idl                               |    6 
 offapi/com/sun/star/svg/XSVGPrinter.idl                                    |    4 
 offapi/com/sun/star/svg/XSVGWriter.idl                                     |    4 
 offapi/com/sun/star/table/AccessibleCellView.idl                           |    4 
 offapi/com/sun/star/table/AccessibleTableView.idl                          |    4 
 offapi/com/sun/star/table/CellRangeListSource.idl                          |    4 
 offapi/com/sun/star/table/CellVertJustify2.idl                             |    4 
 offapi/com/sun/star/task/NoMasterException.idl                             |    4 
 offapi/com/sun/star/task/XAbortChannel.idl                                 |    4 
 offapi/com/sun/star/text/AccessiblePageView.idl                            |    4 
 offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl                  |    4 
 offapi/com/sun/star/text/AccessibleTextGraphicObject.idl                   |    4 
 offapi/com/sun/star/text/DocumentIndexLevelFormat.idl                      |    4 
 offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl                  |    4 
 offapi/com/sun/star/text/DocumentSettings.idl                              |    4 
 offapi/com/sun/star/text/GlobalSettings.idl                                |    4 
 offapi/com/sun/star/text/NumberingStyle.idl                                |    4 
 offapi/com/sun/star/text/TableColumns.idl                                  |    4 
 offapi/com/sun/star/text/TableRows.idl                                     |    4 
 offapi/com/sun/star/text/TextSortable.idl                                  |    4 
 offapi/com/sun/star/text/XTextCopy.idl                                     |    4 
 offapi/com/sun/star/text/fieldmaster/User.idl                              |    4 
 offapi/com/sun/star/text/textfield/DropDown.idl                            |    4 
 offapi/com/sun/star/text/textfield/docinfo/ChangeAuthor.idl                |    4 
 offapi/com/sun/star/text/textfield/docinfo/ChangeDateTime.idl              |    4 
 offapi/com/sun/star/text/textfield/docinfo/CreateAuthor.idl                |    4 
 offapi/com/sun/star/text/textfield/docinfo/CreateDateTime.idl              |    4 
 offapi/com/sun/star/text/textfield/docinfo/EditTime.idl                    |    4 
 offapi/com/sun/star/text/textfield/docinfo/PrintAuthor.idl                 |    4 
 offapi/com/sun/star/text/textfield/docinfo/PrintDateTime.idl               |    4 
 offapi/com/sun/star/ucb/ExpandContentProvider.idl                          |    4 
 offapi/com/sun/star/ucb/InteractiveAppException.idl                        |    4 
 offapi/com/sun/star/ui/ModuleUICategoryDescription.idl                     |    4 
 offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl                  |    4 
 offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl                   |    4 
 offapi/com/sun/star/ui/XUIFunctionListener.idl                             |    4 
 offapi/com/sun/star/ui/dialogs/ControlActions.idl                          |    4 
 offapi/com/sun/star/ui/dialogs/ListboxControlActions.idl                   |    4 
 offapi/com/sun/star/util/JobManager.idl                                    |    4 
 offapi/com/sun/star/util/SearchAlgorithms.idl                              |    4 
 offapi/com/sun/star/util/SearchFlags.idl                                   |    4 
 offapi/com/sun/star/util/SearchOptions.idl                                 |    4 
 offapi/com/sun/star/util/SearchResult.idl                                  |    4 
 offapi/com/sun/star/util/UriAbbreviation.idl                               |    4 
 offapi/com/sun/star/util/XCloseable.idl                                    |    4 
 offapi/com/sun/star/util/XTextSearch.idl                                   |    4 
 offapi/com/sun/star/util/XUniqueIDFactory.idl                              |    4 
 offapi/com/sun/star/view/XFormLayerAccess.idl                              |    4 
 offapi/com/sun/star/xforms/XDataTypeRepository.idl                         |    4 
 offapi/com/sun/star/xforms/XSubmission.idl                                 |    4 
 offapi/com/sun/star/xml/AttributeContainer.idl                             |    4 
 offapi/com/sun/star/xml/NamespaceContainer.idl                             |    4 
 offapi/com/sun/star/xml/crypto/XCipherContext.idl                          |    8 -
 offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl                  |   11 -
 offapi/com/sun/star/xml/crypto/XDigestContext.idl                          |    5 
 offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl                  |   11 -
 offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl                    |    4 
 offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl                 |    4 
 offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl                 |    4 
 offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl                         |    4 
 offapi/com/sun/star/xml/dom/XEntity.idl                                    |    4 
 offapi/com/sun/star/xml/dom/XEntityReference.idl                           |    4 
 offapi/com/sun/star/xml/dom/events/XEvent.idl                              |    4 
 offapi/com/sun/star/xml/input/SaxDocumentHandler.idl                       |    4 
 offapi/com/sun/star/xml/input/XAttributes.idl                              |    4 
 offapi/com/sun/star/xml/input/XElement.idl                                 |    4 
 offapi/com/sun/star/xml/input/XNamespaceMapping.idl                        |    4 
 offapi/com/sun/star/xml/input/XRoot.idl                                    |    4 
 offapi/com/sun/star/xml/sax/FastToken.idl                                  |    4 
 offapi/com/sun/star/xml/xpath/XPathAPI.idl                                 |    9 -
 offapi/com/sun/star/xml/xpath/XPathExtension.idl                           |    3 
 offapi/com/sun/star/xml/xpath/XPathObjectType.idl                          |    4 
 offapi/com/sun/star/xml/xslt/XSLT2Transformer.idl                          |    4 
 offapi/com/sun/star/xml/xslt/XSLTTransformer.idl                           |    4 
 offapi/com/sun/star/xml/xslt/XXSLTTransformer.idl                          |    4 
 offapi/org/freedesktop/PackageKit/XQuery.idl                               |    4 
 reportdesign/source/ui/inspection/GeometryHandler.cxx                      |   15 --
 sw/source/ui/dbui/addresslistdialog.cxx                                    |   16 --
 udkapi/com/sun/star/beans/XMultiPropertyStates.idl                         |    4 
 udkapi/com/sun/star/bridge/BridgeExistsException.idl                       |    4 
 udkapi/com/sun/star/bridge/IiopBridge.idl                                  |    4 
 udkapi/com/sun/star/bridge/InvalidProtocolChangeException.idl              |    5 
 udkapi/com/sun/star/bridge/UrpBridge.idl                                   |    4 
 udkapi/com/sun/star/container/EnumerableMap.idl                            |    4 
 udkapi/com/sun/star/io/MarkableInputStream.idl                             |    4 
 udkapi/com/sun/star/io/MarkableOutputStream.idl                            |    4 
 udkapi/com/sun/star/io/Pump.idl                                            |    4 
 udkapi/com/sun/star/loader/Dynamic.idl                                     |    4 
 udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl          |    4 
 udkapi/com/sun/star/registry/NestedRegistry.idl                            |    4 
 udkapi/com/sun/star/script/ArrayWrapper.idl                                |    4 
 udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl                  |    4 
 udkapi/com/sun/star/uri/XVndSunStarScriptUrlReference.idl                  |    4 
 262 files changed, 767 insertions(+), 760 deletions(-)

New commits:
commit 6e5cb64670936ec86067c48b96e6b51715b6f18c
Author: Noel Grandin <noel at peralex.com>
Date:   Wed Dec 12 17:18:33 2012 +0200

    fdo#46808, Adapt sdb::FilterDialog UNO service to new style
    
    The service already existed, it just did not have an IDL file.
    
    Change-Id: I2267bec182ad1cc8f6a37939861a7368a17fcef2

diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index 5f65656..d3bad7a 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -149,6 +149,25 @@ namespace dbaui
         return new DlgFilterCrit( _pParent, m_aContext.getUNOContext(), _rxConnection, m_xComposer, _rxColumns );
     }
 
+    void RowsetFilterDialog::initialize( const Sequence< Any >& aArguments )
+            throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException)
+    {
+        if( aArguments.getLength() == 3 )
+        {
+            Reference<com::sun::star::sdb::XSingleSelectQueryComposer> xQueryComposer;
+            aArguments[0] >>= xQueryComposer;
+            Reference<com::sun::star::sdbc::XRowSet> xRowSet;
+            aArguments[1] >>= xRowSet;
+            Reference<com::sun::star::awt::XWindow> xParentWindow;
+            aArguments[2] >>= xParentWindow;
+            setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "QueryComposer" ) ), makeAny( xQueryComposer ) );
+            setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RowSet" ) ),        makeAny( xRowSet ) );
+            setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" ) ),  makeAny( xParentWindow ) );
+        }
+        else
+            ComposerDialog::initialize(aArguments);
+    }
+
     //---------------------------------------------------------------------
     void RowsetFilterDialog::executedDialog( sal_Int16 _nExecutionResult )
     {
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx
index b7e94cc..9a718c0 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -98,6 +98,9 @@ namespace dbaui
 
         // OGenericUnoDialog overridables
         virtual void executedDialog( sal_Int16 _nExecutionResult );
+        virtual void initialize( const ::com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
+            throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
+
     };
 
     //=====================================================================
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index eb0998e..61601bb 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -42,6 +42,7 @@
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
+#include <com/sun/star/sdb/FilterDialog.hpp>
 #include <com/sun/star/sdb/RowChangeAction.hpp>
 #include <com/sun/star/frame/CommandGroup.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
@@ -486,54 +487,18 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
         {
             try
             {
-                uno::Reference< lang::XMultiServiceFactory > xORB = ::comphelper::getProcessServiceFactory();
-
-                // build the arguments for the filter dialog to be created
-                Sequence< Any > aDialogCreationArgs( 3 );
-                Any* pDialogCreationArgs = aDialogCreationArgs.getArray();
-                // the query composer
-                *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "QueryComposer" )),
-                                                        -1,
-                                                        makeAny( pDatMan->getParser() ),
-                                                        beans::PropertyState_DIRECT_VALUE
-                                                      );
-
-                // the rowset
-                *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowSet" )),
-                                                        -1,
-                                                        makeAny( pDatMan->getForm() ),
-                                                        beans::PropertyState_DIRECT_VALUE
-                                                      );
-                // the parent window for the dialog
-                *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" )),
-                                                        -1,
-                                                        makeAny( xWindow ),
-                                                        beans::PropertyState_DIRECT_VALUE
-                                                      );
+                uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
 
                 // create the dialog object
-                const ::rtl::OUString sDialogServiceName(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.FilterDialog" ));
-                uno::Reference< uno::XInterface > xDialog = xORB->createInstanceWithArguments(
-                    sDialogServiceName,
-                    aDialogCreationArgs
-                );
-                if ( !xDialog.is() )
+                uno::Reference< ui::dialogs::XExecutableDialog > xDialog = sdb::FilterDialog::createWithQuery(xContext, pDatMan->getParser(),
+                           Reference<sdbc::XRowSet>(pDatMan->getForm(), uno::UNO_QUERY_THROW), xWindow);
+                // execute it
+                if ( xDialog->execute( ) )
                 {
-                    ShowServiceNotAvailableError( VCLUnoHelper::GetWindow( xWindow ), sDialogServiceName, sal_True );
-                }
-                else
-                {
-                    // execute it
-                    uno::Reference< ui::dialogs::XExecutableDialog > xExec( xDialog, UNO_QUERY );
-                    DBG_ASSERT( xExec.is(), "BibFrameController_Impl::dispatch: missing an interface on the dialog!" );
-                    if ( xExec.is() )
-                        if ( xExec->execute( ) )
-                        {
-                            // the dialog has been executed successfully, and the filter on the query composer
-                            // has been changed
-                            ::rtl::OUString sNewFilter = pDatMan->getParser()->getFilter();
-                            pDatMan->setFilter( sNewFilter );
-                        }
+                    // the dialog has been executed successfully, and the filter on the query composer
+                    // has been changed
+                    ::rtl::OUString sNewFilter = pDatMan->getParser()->getFilter();
+                    pDatMan->setFilter( sNewFilter );
                 }
             }
             catch( const uno::Exception& )
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index badf407..2a26b9e 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -43,6 +43,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/container/XChild.hpp>
+#include <com/sun/star/sdb/FilterDialog.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/DatabaseContext.hpp>
@@ -2635,16 +2636,23 @@ namespace pcr
 
             ::rtl::OUString sPropertyUIName( m_pInfoService->getPropertyTranslation( _bFilter ? PROPERTY_ID_FILTER : PROPERTY_ID_SORT ) );
 
-            const sal_Char* pAsciiServiceName = _bFilter ? "com.sun.star.sdb.FilterDialog" : "com.sun.star.sdb.OrderDialog";
-
             // create the dialog
             Reference< XExecutableDialog > xDialog;
-            if ( !m_aContext.createComponent( pAsciiServiceName, xDialog ) )
+            if ( _bFilter)
             {
-                ShowServiceNotAvailableError( impl_getDefaultDialogParent_nothrow(), ::rtl::OUString::createFromAscii( pAsciiServiceName ), sal_True );
-                return false;
+                xDialog.set( sdb::FilterDialog::createDefault(m_aContext.getUNOContext()) );
+            }
+            else
+            {
+                const sal_Char* pAsciiServiceName = "com.sun.star.sdb.OrderDialog";
+                if ( !m_aContext.createComponent( pAsciiServiceName, xDialog ) )
+                {
+                    ShowServiceNotAvailableError( impl_getDefaultDialogParent_nothrow(), ::rtl::OUString::createFromAscii( pAsciiServiceName ), sal_True );
+                    return false;
+                }
             }
 
+
             // initialize the dialog
             Reference< XPropertySet > xDialogProps( xDialog, UNO_QUERY_THROW );
             xDialogProps->setPropertyValue( ::rtl::OUString(  "QueryComposer"  ), makeAny( xComposer ) );
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 6ba363e..996368e 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -37,6 +37,7 @@
 #include <com/sun/star/form/XConfirmDeleteListener.hpp>
 #include <com/sun/star/sdb/RowChangeEvent.hpp>
 #include <com/sun/star/sdb/RowChangeAction.hpp>
+#include <com/sun/star/sdb/FilterDialog.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/form/XReset.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
@@ -1606,33 +1607,36 @@ namespace frm
             return;
         try
         {
-            PropertyValue aFirst;
-            aFirst.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "QueryComposer" ) );
-            aFirst.Value <<= m_xParser;
-
-            PropertyValue aSecond;
-            aSecond.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RowSet" ) );
-            aSecond.Value <<= m_xCursorProperties;
-
-            Sequence<Any> aInit(2);
-            aInit[0] <<= aFirst;
-            aInit[1] <<= aSecond;
-
-            ::rtl::OUString sDialogServiceName;
+            Reference< XExecutableDialog> xDialog;
             if ( _bFilter )
-                sDialogServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.FilterDialog" ) );
+            {
+                xDialog = com::sun::star::sdb::FilterDialog::createWithQuery(m_aContext.getUNOContext(), m_xParser, m_xCursor,
+                              Reference<com::sun::star::awt::XWindow>());
+            }
             else
-                sDialogServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.OrderDialog" ) );
+            {
+                PropertyValue aFirst;
+                aFirst.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "QueryComposer" ) );
+                aFirst.Value <<= m_xParser;
 
-            Reference< XExecutableDialog> xDialog;
-            m_aContext.createComponentWithArguments( sDialogServiceName, aInit, xDialog );
+                PropertyValue aSecond;
+                aSecond.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RowSet" ) );
+                aSecond.Value <<= m_xCursorProperties;
 
-            if ( !xDialog.is() )
-            {
-                ShowServiceNotAvailableError( NULL, sDialogServiceName, sal_True );
-                return;
+                Sequence<Any> aInit(2);
+                aInit[0] <<= aFirst;
+                aInit[1] <<= aSecond;
+
+                ::rtl::OUString sDialogServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.OrderDialog" ) );
+                m_aContext.createComponentWithArguments( sDialogServiceName, aInit, xDialog );
+                if ( !xDialog.is() )
+                {
+                    ShowServiceNotAvailableError( NULL, sDialogServiceName, sal_True );
+                    return;
+                }
             }
 
+
             if ( RET_OK == xDialog->execute() )
             {
                 WaitObject aWO( NULL );
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 7fe2cbb..4ae182e 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -246,6 +246,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb,\
 	DatabaseInteractionHandler \
 	ErrorMessageDialog \
 	InteractionHandler \
+    FilterDialog \
 	ReportDesign \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb/application,\
diff --git a/offapi/com/sun/star/sdb/FilterDialog.idl b/offapi/com/sun/star/sdb/FilterDialog.idl
new file mode 100644
index 0000000..a9c031a
--- /dev/null
+++ b/offapi/com/sun/star/sdb/FilterDialog.idl
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   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_sdb_FilterDialog_idl__
+#define __com_sun_star_sdb_FilterDialog_idl__
+
+#include <com/sun/star/awt/XWindow.idl>
+#include <com/sun/star/sdb/XSingleSelectQueryComposer.idl>
+#include <com/sun/star/sdbc/XRowSet.idl>
+#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
+
+
+module com { module sun { module star { module sdb {
+
+/**
+    This interface could be incomplete since I derived it from its places of use.
+
+    @since LibreOffice 4.1
+*/
+service FilterDialog : com::sun::star::ui::dialogs::XExecutableDialog
+{
+    createDefault();
+
+    createWithQuery([in] com::sun::star::sdb::XSingleSelectQueryComposer QueryComposer,
+                    [in] com::sun::star::sdbc::XRowSet RowSet,
+                    [in] com::sun::star::awt::XWindow ParentWindow);
+};
+
+
+}; }; }; };
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index fa74b09..bd0bbca 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -47,6 +47,7 @@
 #include <com/sun/star/script/Converter.hpp>
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
+#include <com/sun/star/sdb/FilterDialog.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/util/SearchOptions.hpp>
@@ -1594,22 +1595,12 @@ bool GeometryHandler::impl_dialogFilter_nothrow( ::rtl::OUString& _out_rSelected
             return false;
 
         // create the dialog
-        uno::Reference< ui::dialogs::XExecutableDialog > xDialog(xFactory->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.FilterDialog")),m_xContext),uno::UNO_QUERY);
-        if ( !xDialog.is() )
-        {
-            Window* pInspectorWindow = VCLUnoHelper::GetWindow( xInspectorWindow );
-            ShowServiceNotAvailableError( pInspectorWindow, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.FilterDialog")), sal_True );
-            return false;
-        }
+        uno::Reference< ui::dialogs::XExecutableDialog > xDialog = sdb::FilterDialog::createWithQuery(m_xContext, xComposer, m_xRowSet, xInspectorWindow);
 
         const String aGcc3WorkaroundTemporary( ModuleRes(RID_STR_FILTER));
         const ::rtl::OUString sPropertyUIName( aGcc3WorkaroundTemporary );
         // initialize the dialog
-        uno::Reference< beans::XPropertySet > xDialogProps( xDialog, uno::UNO_QUERY_THROW );
-        xDialogProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "QueryComposer" ) ), uno::makeAny( xComposer ) );
-        xDialogProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RowSet" ) ),        uno::makeAny( m_xRowSet ) );
-        xDialogProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" ) ),  uno::makeAny( xInspectorWindow ) );
-        xDialogProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ),         uno::makeAny( sPropertyUIName ) );
+        xDialog->setTitle( sPropertyUIName );
 
         _rClearBeforeDialog.clear();
         bSuccess = ( xDialog->execute() != 0 );
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 0617035..03f80d7 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/sdb/DatabaseContext.hpp>
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
+#include <com/sun/star/sdb/FilterDialog.hpp>
 #include <com/sun/star/sdb/XDocumentDataSource.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
@@ -290,8 +291,6 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl)
                 uno::Reference<XSingleSelectQueryComposer> xComposer(
                         xConnectFactory->createInstance(C2U("com.sun.star.sdb.SingleSelectQueryComposer")), UNO_QUERY_THROW);
 
-                PropertyValue aSecond;
-                aSecond.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RowSet" ) );
                 uno::Reference<XRowSet> xRowSet(
                         xMgr->createInstance(C2U("com.sun.star.sdb.RowSet")), UNO_QUERY);
                 uno::Reference<XPropertySet> xRowProperties(xRowSet, UNO_QUERY);
@@ -302,24 +301,15 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl)
                 xRowProperties->setPropertyValue(C2U("CommandType"), makeAny(pUserData->nCommandType));
                 xRowProperties->setPropertyValue(C2U("ActiveConnection"), makeAny(pUserData->xConnection.getTyped()));
                 xRowSet->execute();
-                aSecond.Value <<= xRowSet;
 
-                PropertyValue aFirst;
-                aFirst.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "QueryComposer" ) );
                 ::rtl::OUString sQuery;
                 xRowProperties->getPropertyValue(C2U("ActiveCommand"))>>= sQuery;
                 xComposer->setQuery(sQuery);
                 if(!pUserData->sFilter.isEmpty())
                     xComposer->setFilter(pUserData->sFilter);
-                aFirst.Value <<= xComposer;
 
-                uno::Sequence<Any> aInit(2);
-                aInit[0] <<= aFirst;
-                aInit[1] <<= aSecond;
-
-                ::rtl::OUString sDialogServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.FilterDialog" ) );
-                uno::Reference< XExecutableDialog> xDialog(
-                        xMgr->createInstanceWithArguments( sDialogServiceName, aInit ), UNO_QUERY);
+                uno::Reference< XExecutableDialog> xDialog = sdb::FilterDialog::createWithQuery( comphelper::getComponentContext(xMgr),
+                   xComposer,xRowSet, uno::Reference<awt::XWindow>() );
 
                 if ( RET_OK == xDialog->execute() )
                 {
commit ec6843f51f38903b16750752e50dc0b05023edab
Author: Noel Grandin <noel at peralex.com>
Date:   Wed Dec 12 14:06:37 2012 +0200

    Fix published/unpublished discrepancy in IDL
    
    Change-Id: I96a45f742ef7170b8fbafa6e5c5286dcbc41f503

diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
index 1665ffc..9e6f0ca 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
@@ -24,7 +24,7 @@
 #include <com/sun/star/sdbc/SQLException.idl>
 
 module com {  module sun {  module star {  module container {
-interface XIndexAccess;
+published interface XIndexAccess;
 };};};};
 
  module com {  module sun {  module star {  module sdb {
commit 648e06f246ce9ee52a3f49394dff66ef5ce41c3f
Author: Noel Grandin <noel at peralex.com>
Date:   Wed Dec 12 12:37:50 2012 +0200

    Fix a bug in the merging of the URD files.
    
    The service name was incorrect.
    
    Change-Id: Iad05ae85cdda6ef9cc357db98838f44bd68651b9

diff --git a/offapi/com/sun/star/xml/xpath/XPathAPI.idl b/offapi/com/sun/star/xml/xpath/XPathAPI.idl
index 86e2530..68aa6e5 100644
--- a/offapi/com/sun/star/xml/xpath/XPathAPI.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathAPI.idl
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_xml_xpath_XPathExtension_idl__
-#define __com_sun_star_xml_xpath_XPathExtension_idl__
+#ifndef __com_sun_star_xml_xpath_XPathAPI_idl__
+#define __com_sun_star_xml_xpath_XPathAPI_idl__
 
 #include <com/sun/star/xml/xpath/XXPathAPI.idl>
 
 module com {  module sun {  module star {  module xml { module xpath {
 
-    service XPathExtension
+    service XPathAPI
     {
         interface XXPathAPI;
     };
commit 2a1b850b789a386fe77fecf8c4c2bfb0a4d099dc
Author: Noel Grandin <noel at peralex.com>
Date:   Wed Dec 12 12:36:45 2012 +0200

    clean up all the UNO IDL module header guards
    
    .. so I don't keep tripping over the bad ones during my UNO cleanup work.
    
    (1) make them all use a similar syntax, makes it easier to run my automatic checker
    (2) some of them were just cut'n'paste accidents waiting to happen
    (3) remove unnecessary header guards in the __including__ file. That is very brittle.
    
    Change-Id: I4e679c15161483ad93aeb316a25d6db6d97e9d4e

diff --git a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
index 19536b0..cef7f82 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_accessibility_XAccessibleTableModelChange_idl__
-#define __com_sun_star_accessibility_XAccessibleTableModelChange_idl__
+#ifndef __com_sun_star_accessibility_AccessibleTableModelChangeType_idl__
+#define __com_sun_star_accessibility_AccessibleTableModelChangeType_idl__
 
 #include <com/sun/star/uno/XInterface.idl>
 
diff --git a/offapi/com/sun/star/animations/TargetPropertiesCreator.idl b/offapi/com/sun/star/animations/TargetPropertiesCreator.idl
index 6f7169f..d40d765 100644
--- a/offapi/com/sun/star/animations/TargetPropertiesCreator.idl
+++ b/offapi/com/sun/star/animations/TargetPropertiesCreator.idl
@@ -20,9 +20,7 @@
 #ifndef __com_sun_star_animations_TargetPropertiesCreator_idl__
 #define __com_sun_star_animations_TargetPropertiesCreator_idl__
 
-#ifndef __com_sun_star_animations_TargetProperties_idl__
 #include <com/sun/star/animations/XTargetPropertiesCreator.idl>
-#endif
 
 
  module com {  module sun {  module star {  module animations {
diff --git a/offapi/com/sun/star/awt/AccessibleTextField.idl b/offapi/com/sun/star/awt/AccessibleTextField.idl
index 0e5f90e..a8c0276 100644
--- a/offapi/com/sun/star/awt/AccessibleTextField.idl
+++ b/offapi/com/sun/star/awt/AccessibleTextField.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_accessibility_AccessibleTextField_idl__
-#define __com_sun_star_accessibility_AccessibleTextField_idl__
+#ifndef __com_sun_star_awt_AccessibleTextField_idl__
+#define __com_sun_star_awt_AccessibleTextField_idl__
 
 #include <com/sun/star/accessibility/AccessibleContext.idl>
 
diff --git a/offapi/com/sun/star/awt/AccessibleToolBox.idl b/offapi/com/sun/star/awt/AccessibleToolBox.idl
index 9cc3a46..3e40842 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBox.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_accessibility_AccessibleToolBox_idl__
-#define __com_sun_star_accessibility_AccessibleToolBox_idl__
+#ifndef __com_sun_star_awt_AccessibleToolBox_idl__
+#define __com_sun_star_awt_AccessibleToolBox_idl__
 
 #include <com/sun/star/accessibility/AccessibleContext.idl>
 
diff --git a/offapi/com/sun/star/awt/ItemListEvent.idl b/offapi/com/sun/star/awt/ItemListEvent.idl
index f8a996a..e8b8406 100644
--- a/offapi/com/sun/star/awt/ItemListEvent.idl
+++ b/offapi/com/sun/star/awt/ItemListEvent.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __offapi_com_sun_star_awt_ListItemEvent_idl__
-#define __offapi_com_sun_star_awt_ListItemEvent_idl__
+#ifndef __com_sun_star_awt_ItemListEvent_idl__
+#define __com_sun_star_awt_ItemListEvent_idl__
 
 #include <com/sun/star/lang/EventObject.idl>
 #include <com/sun/star/beans/Optional.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlButton.idl b/offapi/com/sun/star/awt/UnoControlButton.idl
index 6e6fb28..80aee22 100644
--- a/offapi/com/sun/star/awt/UnoControlButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlButton.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoButtonControl_idl__
-#define __com_sun_star_awt_UnoButtonControl_idl__
+#ifndef __com_sun_star_awt_UnoControlButton_idl__
+#define __com_sun_star_awt_UnoControlButton_idl__
 
 #include <com/sun/star/awt/UnoControl.idl>
 
diff --git a/offapi/com/sun/star/awt/UnoControlCheckBox.idl b/offapi/com/sun/star/awt/UnoControlCheckBox.idl
index ff54bd2..9b2554f 100644
--- a/offapi/com/sun/star/awt/UnoControlCheckBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlCheckBox.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoCheckBoxControl_idl__
-#define __com_sun_star_awt_UnoCheckBoxControl_idl__
+#ifndef __com_sun_star_awt_UnoControlCheckBox_idl__
+#define __com_sun_star_awt_UnoControlCheckBox_idl__
 
 #include <com/sun/star/awt/UnoControl.idl>
 
diff --git a/offapi/com/sun/star/awt/UnoControlComboBox.idl b/offapi/com/sun/star/awt/UnoControlComboBox.idl
index 3908fa4..6850534 100644
--- a/offapi/com/sun/star/awt/UnoControlComboBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlComboBox.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoComboBoxControl_idl__
-#define __com_sun_star_awt_UnoComboBoxControl_idl__
+#ifndef __com_sun_star_awt_UnoControlComboBox_idl__
+#define __com_sun_star_awt_UnoControlComboBox_idl__
 
 #include <com/sun/star/awt/UnoControlEdit.idl>
 
diff --git a/offapi/com/sun/star/awt/UnoControlCurrencyField.idl b/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
index 9acba25..0099f7c 100644
--- a/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
+++ b/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoCurrencyFieldControl_idl__
-#define __com_sun_star_awt_UnoCurrencyFieldControl_idl__
+#ifndef __com_sun_star_awt_UnoControlCurrencyField_idl__
+#define __com_sun_star_awt_UnoControlCurrencyField_idl__
 
 #include <com/sun/star/awt/UnoControlEdit.idl>
 #include <com/sun/star/awt/XSpinField.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlDateField.idl b/offapi/com/sun/star/awt/UnoControlDateField.idl
index 41e3094..058f350 100644
--- a/offapi/com/sun/star/awt/UnoControlDateField.idl
+++ b/offapi/com/sun/star/awt/UnoControlDateField.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoDateFieldControl_idl__
-#define __com_sun_star_awt_UnoDateFieldControl_idl__
+#ifndef __com_sun_star_awt_UnoControlDateField_idl__
+#define __com_sun_star_awt_UnoControlDateField_idl__
 
 #include <com/sun/star/awt/UnoControlEdit.idl>
 #include <com/sun/star/awt/XSpinField.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlFileControl.idl b/offapi/com/sun/star/awt/UnoControlFileControl.idl
index 900484b..69513e5 100644
--- a/offapi/com/sun/star/awt/UnoControlFileControl.idl
+++ b/offapi/com/sun/star/awt/UnoControlFileControl.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoFileControl_idl__
-#define __com_sun_star_awt_UnoFileControl_idl__
+#ifndef __com_sun_star_awt_UnoControlFileControl_idl__
+#define __com_sun_star_awt_UnoControlFileControl_idl__
 
 #include <com/sun/star/awt/UnoControlEdit.idl>
 
diff --git a/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl b/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
index 6eff23a..9f076f2 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoFixedHyperlinkControl_idl__
-#define __com_sun_star_awt_UnoFixedHyperlinkControl_idl__
+#ifndef __com_sun_star_awt_UnoControlFixedHyperlink_idl__
+#define __com_sun_star_awt_UnoControlFixedHyperlink_idl__
 
 #include <com/sun/star/awt/UnoControl.idl>
 #include <com/sun/star/awt/XFixedHyperlink.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlFixedLine.idl b/offapi/com/sun/star/awt/UnoControlFixedLine.idl
index e819e17..3c8885c 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedLine.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedLine.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoFixedLineControl_idl__
-#define __com_sun_star_awt_UnoFixedLineControl_idl__
+#ifndef __com_sun_star_awt_UnoControlFixedLine_idl__
+#define __com_sun_star_awt_UnoControlFixedLine_idl__
 
 #include <com/sun/star/awt/UnoControl.idl>
 
diff --git a/offapi/com/sun/star/awt/UnoControlFixedText.idl b/offapi/com/sun/star/awt/UnoControlFixedText.idl
index 55b6498..732e2cd 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedText.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedText.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoFixedTextControl_idl__
-#define __com_sun_star_awt_UnoFixedTextControl_idl__
+#ifndef __com_sun_star_awt_UnoControlFixedText_idl__
+#define __com_sun_star_awt_UnoControlFixedText_idl__
 
 #include <com/sun/star/awt/UnoControl.idl>
 
diff --git a/offapi/com/sun/star/awt/UnoControlGroupBox.idl b/offapi/com/sun/star/awt/UnoControlGroupBox.idl
index 4105748..10a7c0d 100644
--- a/offapi/com/sun/star/awt/UnoControlGroupBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlGroupBox.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoGroupBoxControl_idl__
-#define __com_sun_star_awt_UnoGroupBoxControl_idl__
+#ifndef __com_sun_star_awt_UnoControlGroupBox_idl__
+#define __com_sun_star_awt_UnoControlGroupBox_idl__
 
 #include <com/sun/star/awt/UnoControl.idl>
 
diff --git a/offapi/com/sun/star/awt/UnoControlImageControl.idl b/offapi/com/sun/star/awt/UnoControlImageControl.idl
index 30282ca..ff53a5e 100644
--- a/offapi/com/sun/star/awt/UnoControlImageControl.idl
+++ b/offapi/com/sun/star/awt/UnoControlImageControl.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoImageControl_idl__
-#define __com_sun_star_awt_UnoImageControl_idl__
+#ifndef __com_sun_star_awt_UnoControlImageControl_idl__
+#define __com_sun_star_awt_UnoControlImageControl_idl__
 
 #include <com/sun/star/awt/UnoControl.idl>
 #include <com/sun/star/awt/XLayoutConstrains.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlListBox.idl b/offapi/com/sun/star/awt/UnoControlListBox.idl
index 4516886..37327b4 100644
--- a/offapi/com/sun/star/awt/UnoControlListBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlListBox.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoListBoxControl_idl__
-#define __com_sun_star_awt_UnoListBoxControl_idl__
+#ifndef __com_sun_star_awt_UnoControlListBox_idl__
+#define __com_sun_star_awt_UnoControlListBox_idl__
 
 #include <com/sun/star/awt/UnoControl.idl>
 
diff --git a/offapi/com/sun/star/awt/UnoControlPatternField.idl b/offapi/com/sun/star/awt/UnoControlPatternField.idl
index ecf48d9..4254eda 100644
--- a/offapi/com/sun/star/awt/UnoControlPatternField.idl
+++ b/offapi/com/sun/star/awt/UnoControlPatternField.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoPatternFieldControl_idl__
-#define __com_sun_star_awt_UnoPatternFieldControl_idl__
+#ifndef __com_sun_star_awt_UnoControlPatternField_idl__
+#define __com_sun_star_awt_UnoControlPatternField_idl__
 
 #include <com/sun/star/awt/UnoControlEdit.idl>
 #include <com/sun/star/awt/XSpinField.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlProgressBar.idl b/offapi/com/sun/star/awt/UnoControlProgressBar.idl
index 4671233..87e9063 100644
--- a/offapi/com/sun/star/awt/UnoControlProgressBar.idl
+++ b/offapi/com/sun/star/awt/UnoControlProgressBar.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoProgressBarControl_idl__
-#define __com_sun_star_awt_UnoProgressBarControl_idl__
+#ifndef __com_sun_star_awt_UnoControlProgressBar_idl__
+#define __com_sun_star_awt_UnoControlProgressBar_idl__
 
 #include <com/sun/star/awt/UnoControl.idl>
 
diff --git a/offapi/com/sun/star/awt/UnoControlRadioButton.idl b/offapi/com/sun/star/awt/UnoControlRadioButton.idl
index ca2f507..c14f40c 100644
--- a/offapi/com/sun/star/awt/UnoControlRadioButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlRadioButton.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoButtonControl_idl__
-#define __com_sun_star_awt_UnoButtonControl_idl__
+#ifndef __com_sun_star_awt_UnoControlRadioButton_idl__
+#define __com_sun_star_awt_UnoControlRadioButton_idl__
 
 #include <com/sun/star/awt/UnoControl.idl>
 
diff --git a/offapi/com/sun/star/awt/UnoControlScrollBar.idl b/offapi/com/sun/star/awt/UnoControlScrollBar.idl
index fd2e7ea..2ea1f2a 100644
--- a/offapi/com/sun/star/awt/UnoControlScrollBar.idl
+++ b/offapi/com/sun/star/awt/UnoControlScrollBar.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoScrollBarControl_idl__
-#define __com_sun_star_awt_UnoScrollBarControl_idl__
+#ifndef __com_sun_star_awt_UnoControlScrollBar_idl__
+#define __com_sun_star_awt_UnoControlScrollBar_idl__
 
 #include <com/sun/star/awt/UnoControl.idl>
 #include <com/sun/star/awt/XScrollBar.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlSpinButton.idl b/offapi/com/sun/star/awt/UnoControlSpinButton.idl
index 8bea87a..c14a9c5 100644
--- a/offapi/com/sun/star/awt/UnoControlSpinButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlSpinButton.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoSpinButtonControl_idl__
-#define __com_sun_star_awt_UnoSpinButtonControl_idl__
+#ifndef __com_sun_star_awt_UnoControlSpinButton_idl__
+#define __com_sun_star_awt_UnoControlSpinButton_idl__
 
 #include <com/sun/star/awt/UnoControl.idl>
 #include <com/sun/star/awt/XSpinValue.idl>
diff --git a/offapi/com/sun/star/awt/UnoControlTimeField.idl b/offapi/com/sun/star/awt/UnoControlTimeField.idl
index d47576d..1c37e99 100644
--- a/offapi/com/sun/star/awt/UnoControlTimeField.idl
+++ b/offapi/com/sun/star/awt/UnoControlTimeField.idl
@@ -16,8 +16,8 @@
  *   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_awt_UnoTimeFieldControl_idl__
-#define __com_sun_star_awt_UnoTimeFieldControl_idl__
+#ifndef __com_sun_star_awt_UnoControlTimeField_idl__
+#define __com_sun_star_awt_UnoControlTimeField_idl__
 
 #include <com/sun/star/awt/UnoControlEdit.idl>
 #include <com/sun/star/awt/XSpinField.idl>
diff --git a/offapi/com/sun/star/awt/XItemList.idl b/offapi/com/sun/star/awt/XItemList.idl
index 976741c..95bfd21 100644
--- a/offapi/com/sun/star/awt/XItemList.idl
+++ b/offapi/com/sun/star/awt/XItemList.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __offapi_com_sun_star_awt_XItemList_idl__
-#define __offapi_com_sun_star_awt_XItemList_idl__
+#ifndef __com_sun_star_awt_XItemList_idl__
+#define __com_sun_star_awt_XItemList_idl__
 
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
 #include <com/sun/star/beans/Pair.idl>
diff --git a/offapi/com/sun/star/awt/XItemListListener.idl b/offapi/com/sun/star/awt/XItemListListener.idl
index 89d21b0..96143a3 100644
--- a/offapi/com/sun/star/awt/XItemListListener.idl
+++ b/offapi/com/sun/star/awt/XItemListListener.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __offapi_com_sun_star_awt_XItemListListener_idl__
-#define __offapi_com_sun_star_awt_XItemListListener_idl__
+#ifndef __com_sun_star_awt_XItemListListener_idl__
+#define __com_sun_star_awt_XItemListListener_idl__
 
 #include <com/sun/star/lang/XEventListener.idl>
 #include <com/sun/star/awt/ItemListEvent.idl>
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
index 44065b0c..faf8143 100644
--- a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
@@ -16,8 +16,8 @@
  *   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_awt_DefaultGridColumnModel_idl__
-#define __com_sun_star_awt_DefaultGridColumnModel_idl__
+#ifndef __com_sun_star_awt_grid_DefaultGridColumnModel_idl__
+#define __com_sun_star_awt_grid_DefaultGridColumnModel_idl__
 
 #include <com/sun/star/awt/grid/XGridColumnModel.idl>
 
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
index 79d81dd..e9029b0 100644
--- a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
+++ b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
@@ -16,8 +16,8 @@
  *   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_awt_DefaultGridDataModel_idl__
-#define __com_sun_star_awt_DefaultGridDataModel_idl__
+#ifndef __com_sun_star_awt_grid_DefaultGridDataModel_idl__
+#define __com_sun_star_awt_grid_DefaultGridDataModel_idl__
 
 #include <com/sun/star/awt/grid/XMutableGridDataModel.idl>
 
diff --git a/offapi/com/sun/star/awt/grid/GridColumn.idl b/offapi/com/sun/star/awt/grid/GridColumn.idl
index de844fd..5ec80bb 100644
--- a/offapi/com/sun/star/awt/grid/GridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumn.idl
@@ -16,8 +16,8 @@
  *   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_awt_GridColumn_idl__
-#define __com_sun_star_awt_GridColumn_idl__
+#ifndef __com_sun_star_awt_grid_GridColumn_idl__
+#define __com_sun_star_awt_grid_GridColumn_idl__
 
 #include <com/sun/star/awt/grid/XGridColumn.idl>
 
diff --git a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
index 504a5e1..38af991 100644
--- a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
@@ -16,8 +16,8 @@
  *   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_awt_GridSelectionEvent_idl__
-#define __com_sun_star_awt_GridSelectionEvent_idl__
+#ifndef __com_sun_star_awt_grid_GridSelectionEvent_idl__
+#define __com_sun_star_awt_grid_GridSelectionEvent_idl__
 
 #include <com/sun/star/lang/EventObject.idl>
 
diff --git a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
index e70a65e..98e30d5 100644
--- a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
+++ b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
@@ -16,16 +16,14 @@
  *   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_awt_UnoControlGrid_idl__
-#define __com_sun_star_awt_UnoControlGrid_idl__
+#ifndef __com_sun_star_awt_grid_UnoControlGrid_idl__
+#define __com_sun_star_awt_grid_UnoControlGrid_idl__
 
 #include <com/sun/star/awt/UnoControl.idl>
 
 #include <com/sun/star/awt/grid/XGridControl.idl>
 
-#ifndef __com_sun_star_awt_grid_XGridRowSelection_idl__
 #include <com/sun/star/awt/grid/XGridRowSelection.idl>
-#endif
 
 
  module com {  module sun {  module star {  module awt {  module grid {
diff --git a/offapi/com/sun/star/awt/grid/XGridRowSelection.idl b/offapi/com/sun/star/awt/grid/XGridRowSelection.idl
index 5f137d1..af75597 100644
--- a/offapi/com/sun/star/awt/grid/XGridRowSelection.idl
+++ b/offapi/com/sun/star/awt/grid/XGridRowSelection.idl
@@ -16,8 +16,8 @@
  *   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_awt_grid_XGridSelection_idl__
-#define __com_sun_star_awt_grid_XGridSelection_idl__
+#ifndef __com_sun_star_awt_grid_XGridRowSelection_idl__
+#define __com_sun_star_awt_grid_XGridRowSelection_idl__
 
 #include <com/sun/star/awt/grid/XGridSelectionListener.idl>
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
diff --git a/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl b/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
index b51916c..030815b 100644
--- a/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
+++ b/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
@@ -16,8 +16,8 @@
  *   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_awt_tab_TabPageActivationEvent_idl__
-#define __com_sun_star_awt_tab_TabPageActivationEvent_idl__
+#ifndef __com_sun_star_awt_tab_TabPageActivatedEvent_idl__
+#define __com_sun_star_awt_tab_TabPageActivatedEvent_idl__
 
 #include <com/sun/star/lang/EventObject.idl>
 
diff --git a/offapi/com/sun/star/chart2/Axis.idl b/offapi/com/sun/star/chart2/Axis.idl
index 3c3a0a3..9fb4a20 100644
--- a/offapi/com/sun/star/chart2/Axis.idl
+++ b/offapi/com/sun/star/chart2/Axis.idl
@@ -16,8 +16,8 @@
  *   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_chart_Axis_idl
-#define com_sun_star_chart_Axis_idl
+#ifndef com_sun_star_chart2_Axis_idl
+#define com_sun_star_chart2_Axis_idl
 
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/awt/Size.idl>
diff --git a/offapi/com/sun/star/chart2/ChartTypeManager.idl b/offapi/com/sun/star/chart2/ChartTypeManager.idl
index ac9a970..12b9073 100644
--- a/offapi/com/sun/star/chart2/ChartTypeManager.idl
+++ b/offapi/com/sun/star/chart2/ChartTypeManager.idl
@@ -16,8 +16,8 @@
  *   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_chart_ChartTypeManager_idl
-#define com_sun_star_chart_ChartTypeManager_idl
+#ifndef com_sun_star_chart2_ChartTypeManager_idl
+#define com_sun_star_chart2_ChartTypeManager_idl
 
 #include <com/sun/star/lang/MultiServiceFactory.idl>
 
diff --git a/offapi/com/sun/star/chart2/ChartTypeTemplate.idl b/offapi/com/sun/star/chart2/ChartTypeTemplate.idl
index ea4048c..e2f74c2 100644
--- a/offapi/com/sun/star/chart2/ChartTypeTemplate.idl
+++ b/offapi/com/sun/star/chart2/ChartTypeTemplate.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef com_sun_star_chart_ChartTypeTemplate_idl
-#define com_sun_star_chart_ChartTypeTemplate_idl
+#ifndef com_sun_star_chart2_ChartTypeTemplate_idl
+#define com_sun_star_chart2_ChartTypeTemplate_idl
 
 #include <com/sun/star/chart2/XChartTypeTemplate.idl>
 
diff --git a/offapi/com/sun/star/chart2/Diagram.idl b/offapi/com/sun/star/chart2/Diagram.idl
index 84c2ce7..e820364 100644
--- a/offapi/com/sun/star/chart2/Diagram.idl
+++ b/offapi/com/sun/star/chart2/Diagram.idl
@@ -16,8 +16,8 @@
  *   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_chart_Diagram_idl
-#define com_sun_star_chart_Diagram_idl
+#ifndef com_sun_star_chart2_Diagram_idl
+#define com_sun_star_chart2_Diagram_idl
 
 #include <com/sun/star/chart2/XDiagram.idl>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.idl>
diff --git a/offapi/com/sun/star/chart2/ErrorBar.idl b/offapi/com/sun/star/chart2/ErrorBar.idl
index ee73dec..384bb4f 100644
--- a/offapi/com/sun/star/chart2/ErrorBar.idl
+++ b/offapi/com/sun/star/chart2/ErrorBar.idl
@@ -16,8 +16,8 @@
  *   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_chart_ErrorBar_idl
-#define com_sun_star_chart_ErrorBar_idl
+#ifndef com_sun_star_chart2_ErrorBar_idl
+#define com_sun_star_chart2_ErrorBar_idl
 
 #include <com/sun/star/drawing/LineProperties.idl>
 #include <com/sun/star/chart/ErrorBarStyle.idl>
diff --git a/offapi/com/sun/star/chart2/FormattedString.idl b/offapi/com/sun/star/chart2/FormattedString.idl
index 21fb90d..e4be3c7 100644
--- a/offapi/com/sun/star/chart2/FormattedString.idl
+++ b/offapi/com/sun/star/chart2/FormattedString.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef com_sun_star_chart_FormattedString_idl
-#define com_sun_star_chart_FormattedString_idl
+#ifndef com_sun_star_chart2_FormattedString_idl
+#define com_sun_star_chart2_FormattedString_idl
 
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/style/CharacterProperties.idl>
diff --git a/offapi/com/sun/star/chart2/GridProperties.idl b/offapi/com/sun/star/chart2/GridProperties.idl
index 74a7021..0db2360 100644
--- a/offapi/com/sun/star/chart2/GridProperties.idl
+++ b/offapi/com/sun/star/chart2/GridProperties.idl
@@ -16,8 +16,8 @@
  *   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_chart_GridProperties_idl
-#define com_sun_star_chart_GridProperties_idl
+#ifndef com_sun_star_chart2_GridProperties_idl
+#define com_sun_star_chart2_GridProperties_idl
 
 #include <com/sun/star/drawing/LineProperties.idl>
 
diff --git a/offapi/com/sun/star/chart2/LegendPosition.idl b/offapi/com/sun/star/chart2/LegendPosition.idl
index 6e088e9..16bac17 100644
--- a/offapi/com/sun/star/chart2/LegendPosition.idl
+++ b/offapi/com/sun/star/chart2/LegendPosition.idl
@@ -16,8 +16,8 @@
  *   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_chart_LegendPosition_idl
-#define com_sun_star_chart_LegendPosition_idl
+#ifndef com_sun_star_chart2_LegendPosition_idl
+#define com_sun_star_chart2_LegendPosition_idl
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/LightSource.idl b/offapi/com/sun/star/chart2/LightSource.idl
index 500bd3f..0912982 100644
--- a/offapi/com/sun/star/chart2/LightSource.idl
+++ b/offapi/com/sun/star/chart2/LightSource.idl
@@ -16,8 +16,8 @@
  *   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_chart_LightSource_idl
-#define com_sun_star_chart_LightSource_idl
+#ifndef com_sun_star_chart2_LightSource_idl
+#define com_sun_star_chart2_LightSource_idl
 
 #include <com/sun/star/drawing/Direction3D.idl>
 
diff --git a/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl b/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
index 830fba7..a9e4672 100644
--- a/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
+++ b/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
@@ -16,8 +16,8 @@
  *   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_chart_StandardDiagramCreationParameters_idl
-#define com_sun_star_chart_StandardDiagramCreationParameters_idl
+#ifndef com_sun_star_chart2_StandardDiagramCreationParameters_idl
+#define com_sun_star_chart2_StandardDiagramCreationParameters_idl
 
 #include <com/sun/star/beans/PropertyValue.idl>
 
diff --git a/offapi/com/sun/star/chart2/Title.idl b/offapi/com/sun/star/chart2/Title.idl
index 3a12eb2..24bcfd5 100644
--- a/offapi/com/sun/star/chart2/Title.idl
+++ b/offapi/com/sun/star/chart2/Title.idl
@@ -16,8 +16,8 @@
  *   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_chart_Title_idl
-#define com_sun_star_chart_Title_idl
+#ifndef com_sun_star_chart2_Title_idl
+#define com_sun_star_chart2_Title_idl
 
 #include <com/sun/star/style/ParagraphProperties.idl>
 #include <com/sun/star/chart2/XTitle.idl>
diff --git a/offapi/com/sun/star/chart2/XChartTypeManager.idl b/offapi/com/sun/star/chart2/XChartTypeManager.idl
index 2792af5..abafeb3 100644
--- a/offapi/com/sun/star/chart2/XChartTypeManager.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeManager.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef com_sun_star_chart_XChartTypeManager_idl
-#define com_sun_star_chart_XChartTypeManager_idl
+#ifndef com_sun_star_chart2_XChartTypeManager_idl
+#define com_sun_star_chart2_XChartTypeManager_idl
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
diff --git a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
index f523b08..b2765e2 100644
--- a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
@@ -16,8 +16,8 @@
  *   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_chart_XChartTypeTemplate_idl
-#define com_sun_star_chart_XChartTypeTemplate_idl
+#ifndef com_sun_star_chart2_XChartTypeTemplate_idl
+#define com_sun_star_chart2_XChartTypeTemplate_idl
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/beans/PropertyValue.idl>
diff --git a/offapi/com/sun/star/chart2/XFormattedString.idl b/offapi/com/sun/star/chart2/XFormattedString.idl
index 7d8b3d8..f8427b9 100644
--- a/offapi/com/sun/star/chart2/XFormattedString.idl
+++ b/offapi/com/sun/star/chart2/XFormattedString.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef com_sun_star_chart_XFormattedString_idl
-#define com_sun_star_chart_XFormattedString_idl
+#ifndef com_sun_star_chart2_XFormattedString_idl
+#define com_sun_star_chart2_XFormattedString_idl
 
 #include <com/sun/star/uno/XInterface.idl>
 
diff --git a/offapi/com/sun/star/chart2/XLegend.idl b/offapi/com/sun/star/chart2/XLegend.idl
index fd5c012..4db1473 100644
--- a/offapi/com/sun/star/chart2/XLegend.idl
+++ b/offapi/com/sun/star/chart2/XLegend.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef com_sun_star_chart_XLegend_idl
-#define com_sun_star_chart_XLegend_idl
+#ifndef com_sun_star_chart2_XLegend_idl
+#define com_sun_star_chart2_XLegend_idl
 
 #include <com/sun/star/uno/XInterface.idl>
 
diff --git a/offapi/com/sun/star/chart2/XTitle.idl b/offapi/com/sun/star/chart2/XTitle.idl
index 6ae581d..e663755 100644
--- a/offapi/com/sun/star/chart2/XTitle.idl
+++ b/offapi/com/sun/star/chart2/XTitle.idl
@@ -16,8 +16,8 @@
  *   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_chart_XTitle_idl
-#define com_sun_star_chart_XTitle_idl
+#ifndef com_sun_star_chart2_XTitle_idl
+#define com_sun_star_chart2_XTitle_idl
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/chart2/XFormattedString.idl>
diff --git a/offapi/com/sun/star/chart2/XTitled.idl b/offapi/com/sun/star/chart2/XTitled.idl
index 9795cac..3a5ec18 100644
--- a/offapi/com/sun/star/chart2/XTitled.idl
+++ b/offapi/com/sun/star/chart2/XTitled.idl
@@ -16,8 +16,8 @@
  *   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_chart_XTitled_idl
-#define com_sun_star_chart_XTitled_idl
+#ifndef com_sun_star_chart2_XTitled_idl
+#define com_sun_star_chart2_XTitled_idl
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/chart2/XTitle.idl>
diff --git a/offapi/com/sun/star/chart2/data/DataProvider.idl b/offapi/com/sun/star/chart2/data/DataProvider.idl
index dd1689d..34ba0be 100644
--- a/offapi/com/sun/star/chart2/data/DataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/DataProvider.idl
@@ -16,8 +16,8 @@
  *   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_chart_data_DataProvider_idl
-#define com_sun_star_chart_data_DataProvider_idl
+#ifndef com_sun_star_chart2_data_DataProvider_idl
+#define com_sun_star_chart2_data_DataProvider_idl
 
 #include <com/sun/star/chart2/data/XDataProvider.idl>
 #include <com/sun/star/chart2/data/XRangeXMLConversion.idl>
diff --git a/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl
index 2a34af2..a9bf0fe 100644
--- a/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_report_DatabaseDataProvider_idl__
-#define __com_sun_star_report_DatabaseDataProvider_idl__
+#ifndef __com_sun_star_chart2_data_DatabaseDataProvider_idl__
+#define __com_sun_star_chart2_data_DatabaseDataProvider_idl__
 
 #include <com/sun/star/chart2/data/XDatabaseDataProvider.idl>
 
diff --git a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
index 9e625d9..0710ff5 100644
--- a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
@@ -16,8 +16,8 @@
  *   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_XDatabaseDataProvider_idl__
-#define __com_sun_star_report_XDatabaseDataProvider_idl__
+#ifndef __com_sun_star_chart2_data_XDatabaseDataProvider_idl__
+#define __com_sun_star_chart2_data_XDatabaseDataProvider_idl__
 
 #include <com/sun/star/container/NoSuchElementException.idl>
 #include <com/sun/star/beans/XPropertySet.idl>
diff --git a/offapi/com/sun/star/configuration/AdministrationProvider.idl b/offapi/com/sun/star/configuration/AdministrationProvider.idl
index 79a90ba..6fcb945 100644
--- a/offapi/com/sun/star/configuration/AdministrationProvider.idl
+++ b/offapi/com/sun/star/configuration/AdministrationProvider.idl
@@ -16,8 +16,8 @@
  *   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_configuration_ConfigurationProvider_idl__
-#define __com_sun_star_configuration_ConfigurationProvider_idl__
+#ifndef __com_sun_star_configuration_AdministrationProvider_idl__
+#define __com_sun_star_configuration_AdministrationProvider_idl__
 
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
 #include <com/sun/star/lang/XComponent.idl>
diff --git a/offapi/com/sun/star/configuration/ReadOnlyAccess.idl b/offapi/com/sun/star/configuration/ReadOnlyAccess.idl
index dc47c68..d833e14 100644
--- a/offapi/com/sun/star/configuration/ReadOnlyAccess.idl
+++ b/offapi/com/sun/star/configuration/ReadOnlyAccess.idl
@@ -27,8 +27,8 @@
  * instead of those above.
  */
 
-#ifndef INCLUDED_COM_SUN_STAR_CONFIGURATION_READONLYACCESS_IDL
-#define INCLUDED_COM_SUN_STAR_CONFIGURATION_READONLYACCESS_IDL
+#ifndef _COM_SUN_STAR_CONFIGURATION_READONLYACCESS_IDL
+#define _COM_SUN_STAR_CONFIGURATION_READONLYACCESS_IDL
 
 #include <com/sun/star/container/XHierarchicalNameAccess.idl>
 
diff --git a/offapi/com/sun/star/configuration/ReadWriteAccess.idl b/offapi/com/sun/star/configuration/ReadWriteAccess.idl
index f9a3a03..3c48999 100644
--- a/offapi/com/sun/star/configuration/ReadWriteAccess.idl
+++ b/offapi/com/sun/star/configuration/ReadWriteAccess.idl
@@ -27,8 +27,8 @@
  * instead of those above.
  */
 
-#ifndef INCLUDED_COM_SUN_STAR_CONFIGURATION_READWRITEACCESS_IDL
-#define INCLUDED_COM_SUN_STAR_CONFIGURATION_READWRITEACCESS_IDL
+#ifndef _COM_SUN_STAR_CONFIGURATION_READWRITEACCESS_IDL
+#define _COM_SUN_STAR_CONFIGURATION_READWRITEACCESS_IDL
 
 #include <com/sun/star/configuration/XReadWriteAccess.idl>
 
diff --git a/offapi/com/sun/star/configuration/XReadWriteAccess.idl b/offapi/com/sun/star/configuration/XReadWriteAccess.idl
index c5e8c31..7c3bd73 100644
--- a/offapi/com/sun/star/configuration/XReadWriteAccess.idl
+++ b/offapi/com/sun/star/configuration/XReadWriteAccess.idl
@@ -27,8 +27,8 @@
  * instead of those above.
  */
 
-#ifndef INCLUDED_COM_SUN_STAR_CONFIGURATION_XREADWRITEACCESS_IDL
-#define INCLUDED_COM_SUN_STAR_CONFIGURATION_XREADWRITEACCESS_IDL
+#ifndef _COM_SUN_STAR_CONFIGURATION_XREADWRITEACCESS_IDL
+#define _COM_SUN_STAR_CONFIGURATION_XREADWRITEACCESS_IDL
 
 #include <com/sun/star/container/XHierarchicalNameReplace.idl>
 #include <com/sun/star/util/XChangesBatch.idl>
diff --git a/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl b/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
index 8f7677d..b88120a 100644
--- a/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
@@ -16,8 +16,8 @@
  *   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_configuration_backend_SingleLayerStratum_idl__
-#define __com_sun_star_configuration_backend_SingleLayerStratum_idl__
+#ifndef __com_sun_star_configuration_backend_MultiLayerStratum_idl__
+#define __com_sun_star_configuration_backend_MultiLayerStratum_idl__
 
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
 #include <com/sun/star/configuration/backend/XMultiLayerStratum.idl>
diff --git a/offapi/com/sun/star/configuration/theDefaultProvider.idl b/offapi/com/sun/star/configuration/theDefaultProvider.idl
index ecb8661..39301ca 100644
--- a/offapi/com/sun/star/configuration/theDefaultProvider.idl
+++ b/offapi/com/sun/star/configuration/theDefaultProvider.idl
@@ -27,8 +27,8 @@
  * instead of those above.
  */
 
-#ifndef INCLUDED_COM_SUN_STAR_CONFIGURATION_THEDEFAULTPROVIDER_IDL
-#define INCLUDED_COM_SUN_STAR_CONFIGURATION_THEDEFAULTPROVIDER_IDL
+#ifndef _COM_SUN_STAR_CONFIGURATION_THEDEFAULTPROVIDER_IDL
+#define _COM_SUN_STAR_CONFIGURATION_THEDEFAULTPROVIDER_IDL
 
 module com { module sun { module star { module lang {
     published interface XMultiServiceFactory;
diff --git a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
index 093f74d..143eb3e 100644
--- a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
+++ b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_datatransfer_MimeContentType_idl__
-#define __com_sun_star_datatransfer_MimeContentType_idl__
+#ifndef __com_sun_star_datatransfer_MimeContentTypeFactory_idl__
+#define __com_sun_star_datatransfer_MimeContentTypeFactory_idl__
 
 
 module com { module sun { module star { module datatransfer {
diff --git a/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl b/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
index 8909b02..b3ce22a 100644
--- a/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_datatransfer_XTransferDataInfo_idl__
-#define __com_sun_star_datatransfer_XTransferDataInfo_idl__
+#ifndef __com_sun_star_datatransfer_XTransferDataAccess_idl__
+#define __com_sun_star_datatransfer_XTransferDataAccess_idl__
 
 #include <com/sun/star/datatransfer/DataFlavor.idl>
 #include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/deployment/DependencyException.idl b/offapi/com/sun/star/deployment/DependencyException.idl
index eb4e469..0b90703 100644
--- a/offapi/com/sun/star/deployment/DependencyException.idl
+++ b/offapi/com/sun/star/deployment/DependencyException.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_COM_SUN_STAR_DEPLOYMENT_DEPENDENCYEXCEPTION_IDL
-#define INCLUDED_COM_SUN_STAR_DEPLOYMENT_DEPENDENCYEXCEPTION_IDL
+#ifndef _COM_SUN_STAR_DEPLOYMENT_DEPENDENCYEXCEPTION_IDL
+#define _COM_SUN_STAR_DEPLOYMENT_DEPENDENCYEXCEPTION_IDL
 
 #include <com/sun/star/uno/Exception.idl>
 
diff --git a/offapi/com/sun/star/deployment/DeploymentException.idl b/offapi/com/sun/star/deployment/DeploymentException.idl
index 8b9b51d..7868505 100644
--- a/offapi/com/sun/star/deployment/DeploymentException.idl
+++ b/offapi/com/sun/star/deployment/DeploymentException.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_com_sun_star_deployment_DeploymentException_idl
-#define INCLUDED_com_sun_star_deployment_DeploymentException_idl
+#ifndef _com_sun_star_deployment_DeploymentException_idl
+#define _com_sun_star_deployment_DeploymentException_idl
 
 #include <com/sun/star/uno/Exception.idl>
 
diff --git a/offapi/com/sun/star/deployment/ExtensionManager.idl b/offapi/com/sun/star/deployment/ExtensionManager.idl
index b709de9..27b6e58 100644
--- a/offapi/com/sun/star/deployment/ExtensionManager.idl
+++ b/offapi/com/sun/star/deployment/ExtensionManager.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_com_sun_star_deployment_ExtensionManagerFactory_idl
-#define INCLUDED_com_sun_star_deployment_ExtensionManagerFactory_idl
+#ifndef _com_sun_star_deployment_ExtensionManager_idl
+#define _com_sun_star_deployment_ExtensionManager_idl
 
 #include <com/sun/star/deployment/XExtensionManager.idl>
 
diff --git a/offapi/com/sun/star/deployment/ExtensionRemovedException.idl b/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
index b4143ea..872c456 100644
--- a/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
+++ b/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_COM_SUN_STAR_DEPLOYMENT_EXTENSIONREMOVEDEXCEPTION_IDL
-#define INCLUDED_COM_SUN_STAR_DEPLOYMENT_EXTENSIONREMOVEDEXCEPTION_IDL
+#ifndef _COM_SUN_STAR_DEPLOYMENT_EXTENSIONREMOVEDEXCEPTION_IDL
+#define _COM_SUN_STAR_DEPLOYMENT_EXTENSIONREMOVEDEXCEPTION_IDL
 
 #include <com/sun/star/uno/Exception.idl>
 
diff --git a/offapi/com/sun/star/deployment/InstallException.idl b/offapi/com/sun/star/deployment/InstallException.idl
index 9777b77..5068872 100644
--- a/offapi/com/sun/star/deployment/InstallException.idl
+++ b/offapi/com/sun/star/deployment/InstallException.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_COM_SUN_STAR_DEPLOYMENT_INSTALLEXCEPTION_IDL
-#define INCLUDED_COM_SUN_STAR_DEPLOYMENT_INSTALLEXCEPTION_IDL
+#ifndef _COM_SUN_STAR_DEPLOYMENT_INSTALLEXCEPTION_IDL
+#define _COM_SUN_STAR_DEPLOYMENT_INSTALLEXCEPTION_IDL
 
 #include <com/sun/star/uno/Exception.idl>
 
diff --git a/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl b/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
index 66a34ac..329874e 100644
--- a/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
+++ b/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_COM_SUN_STAR_DEPLOYMENT_INVALIDREMOVEDPARAMETEREXCEPTION_IDL
-#define INCLUDED_COM_SUN_STAR_DEPLOYMENT_INVALIDREMOVEDPARAMETEREXCEPTION_IDL
+#ifndef _COM_SUN_STAR_DEPLOYMENT_INVALIDREMOVEDPARAMETEREXCEPTION_IDL
+#define _COM_SUN_STAR_DEPLOYMENT_INVALIDREMOVEDPARAMETEREXCEPTION_IDL
 
 #include <com/sun/star/uno/Exception.idl>
 
diff --git a/offapi/com/sun/star/deployment/LicenseException.idl b/offapi/com/sun/star/deployment/LicenseException.idl
index a12fd10..04a8f49 100644
--- a/offapi/com/sun/star/deployment/LicenseException.idl
+++ b/offapi/com/sun/star/deployment/LicenseException.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_com_sun_star_deployment_LicenseException_idl
-#define INCLUDED_com_sun_star_deployment_LicenseException_idl
+#ifndef _com_sun_star_deployment_LicenseException_idl
+#define _com_sun_star_deployment_LicenseException_idl
 
 #include <com/sun/star/uno/Exception.idl>
 
diff --git a/offapi/com/sun/star/deployment/PackageRegistryBackend.idl b/offapi/com/sun/star/deployment/PackageRegistryBackend.idl
index 176ece7..e4c6f23 100644
--- a/offapi/com/sun/star/deployment/PackageRegistryBackend.idl
+++ b/offapi/com/sun/star/deployment/PackageRegistryBackend.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_com_sun_star_deployment_PackageRegistryBackend_idl
-#define INCLUDED_com_sun_star_deployment_PackageRegistryBackend_idl
+#ifndef _com_sun_star_deployment_PackageRegistryBackend_idl
+#define _com_sun_star_deployment_PackageRegistryBackend_idl
 
 #include <com/sun/star/deployment/XPackageRegistry.idl>
 
diff --git a/offapi/com/sun/star/deployment/PlatformException.idl b/offapi/com/sun/star/deployment/PlatformException.idl
index 56d7c17..be050b4 100644
--- a/offapi/com/sun/star/deployment/PlatformException.idl
+++ b/offapi/com/sun/star/deployment/PlatformException.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_com_sun_star_deployment_PlatformException_idl
-#define INCLUDED_com_sun_star_deployment_PlatformException_idl
+#ifndef _com_sun_star_deployment_PlatformException_idl
+#define _com_sun_star_deployment_PlatformException_idl
 
 #include <com/sun/star/uno/Exception.idl>
 
diff --git a/offapi/com/sun/star/deployment/VersionException.idl b/offapi/com/sun/star/deployment/VersionException.idl
index 002349b..84056ed 100644
--- a/offapi/com/sun/star/deployment/VersionException.idl
+++ b/offapi/com/sun/star/deployment/VersionException.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_COM_SUN_STAR_DEPLOYMENT_VERSIONEXCEPTION_IDL
-#define INCLUDED_COM_SUN_STAR_DEPLOYMENT_VERSIONEXCEPTION_IDL
+#ifndef _COM_SUN_STAR_DEPLOYMENT_VERSIONEXCEPTION_IDL
+#define _COM_SUN_STAR_DEPLOYMENT_VERSIONEXCEPTION_IDL
 
 #include <com/sun/star/uno/Exception.idl>
 
diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl
index 97c1591..a77f716 100644
--- a/offapi/com/sun/star/deployment/XExtensionManager.idl
+++ b/offapi/com/sun/star/deployment/XExtensionManager.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_com_sun_star_deployment_XExtensionManager_idl
-#define INCLUDED_com_sun_star_deployment_XExtensionManager_idl
+#ifndef _com_sun_star_deployment_XExtensionManager_idl
+#define _com_sun_star_deployment_XExtensionManager_idl
 
 #include <com/sun/star/lang/XComponent.idl>
 #include <com/sun/star/task/XAbortChannel.idl>
diff --git a/offapi/com/sun/star/deployment/XPackage.idl b/offapi/com/sun/star/deployment/XPackage.idl
index 58b3f1f..ef04b73 100644
--- a/offapi/com/sun/star/deployment/XPackage.idl
+++ b/offapi/com/sun/star/deployment/XPackage.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_com_sun_star_deployment_XPackage_idl
-#define INCLUDED_com_sun_star_deployment_XPackage_idl
+#ifndef _com_sun_star_deployment_XPackage_idl
+#define _com_sun_star_deployment_XPackage_idl
 
 #include <com/sun/star/beans/Optional.idl>
 #include <com/sun/star/beans/Ambiguous.idl>
diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl
index c8f1864..40fd7f7 100644
--- a/offapi/com/sun/star/deployment/XPackageManager.idl
+++ b/offapi/com/sun/star/deployment/XPackageManager.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_com_sun_star_deployment_XPackageManager_idl
-#define INCLUDED_com_sun_star_deployment_XPackageManager_idl
+#ifndef _com_sun_star_deployment_XPackageManager_idl
+#define _com_sun_star_deployment_XPackageManager_idl
 
 #include <com/sun/star/lang/XComponent.idl>
 #include <com/sun/star/task/XAbortChannel.idl>
diff --git a/offapi/com/sun/star/deployment/XPackageManagerFactory.idl b/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
index 358c1d4..b81aa70 100644
--- a/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
+++ b/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_com_sun_star_deployment_XPackageManagerFactory_idl
-#define INCLUDED_com_sun_star_deployment_XPackageManagerFactory_idl
+#ifndef _com_sun_star_deployment_XPackageManagerFactory_idl
+#define _com_sun_star_deployment_XPackageManagerFactory_idl
 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #include <com/sun/star/deployment/XPackageManager.idl>
diff --git a/offapi/com/sun/star/deployment/XPackageRegistry.idl b/offapi/com/sun/star/deployment/XPackageRegistry.idl
index 710cf57..b9f1f9a 100644
--- a/offapi/com/sun/star/deployment/XPackageRegistry.idl
+++ b/offapi/com/sun/star/deployment/XPackageRegistry.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_com_sun_star_deployment_XPackageRegistry_idl
-#define INCLUDED_com_sun_star_deployment_XPackageRegistry_idl
+#ifndef _com_sun_star_deployment_XPackageRegistry_idl
+#define _com_sun_star_deployment_XPackageRegistry_idl
 
 #include <com/sun/star/deployment/XPackage.idl>
 #include <com/sun/star/deployment/XPackageTypeInfo.idl>
diff --git a/offapi/com/sun/star/deployment/XPackageTypeInfo.idl b/offapi/com/sun/star/deployment/XPackageTypeInfo.idl
index 218da41..ce4e4d8 100644
--- a/offapi/com/sun/star/deployment/XPackageTypeInfo.idl
+++ b/offapi/com/sun/star/deployment/XPackageTypeInfo.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_com_sun_star_deployment_XPackageTypeInfo_idl
-#define INCLUDED_com_sun_star_deployment_XPackageTypeInfo_idl
+#ifndef _com_sun_star_deployment_XPackageTypeInfo_idl
+#define _com_sun_star_deployment_XPackageTypeInfo_idl
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/deployment/ExtensionRemovedException.idl>
diff --git a/offapi/com/sun/star/deployment/thePackageManagerFactory.idl b/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
index 6df88db..4257a60 100644
--- a/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
+++ b/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_com_sun_star_deployment_thePackageManagerFactory_idl
-#define INCLUDED_com_sun_star_deployment_thePackageManagerFactory_idl
+#ifndef _com_sun_star_deployment_thePackageManagerFactory_idl
+#define _com_sun_star_deployment_thePackageManagerFactory_idl
 
 #include <com/sun/star/deployment/XPackageManagerFactory.idl>
 
diff --git a/offapi/com/sun/star/deployment/ui/LicenseDialog.idl b/offapi/com/sun/star/deployment/ui/LicenseDialog.idl
index 347f1f4..f1c8f2c 100644
--- a/offapi/com/sun/star/deployment/ui/LicenseDialog.idl
+++ b/offapi/com/sun/star/deployment/ui/LicenseDialog.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_com_sun_star_deployment_ui_LicenseDialog_idl
-#define INCLUDED_com_sun_star_deployment_ui_LicenseDialog_idl
+#ifndef _com_sun_star_deployment_ui_LicenseDialog_idl
+#define _com_sun_star_deployment_ui_LicenseDialog_idl
 
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
 #include <com/sun/star/awt/XWindow.idl>
diff --git a/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl b/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
index f5da87e9..cf8fa6c 100644
--- a/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
+++ b/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_com_sun_star_deployment_ui_PackageManagerDialog_idl
-#define INCLUDED_com_sun_star_deployment_ui_PackageManagerDialog_idl
+#ifndef _com_sun_star_deployment_ui_PackageManagerDialog_idl
+#define _com_sun_star_deployment_ui_PackageManagerDialog_idl
 
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl>
 #include <com/sun/star/awt/XWindow.idl>
diff --git a/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl b/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
index 526860a..297fcb6 100644
--- a/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
+++ b/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_com_sun_star_deployment_ui_UpdateRequiredDialog_idl
-#define INCLUDED_com_sun_star_deployment_ui_UpdateRequiredDialog_idl
+#ifndef _com_sun_star_deployment_ui_UpdateRequiredDialog_idl
+#define _com_sun_star_deployment_ui_UpdateRequiredDialog_idl
 
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
 #include <com/sun/star/awt/XWindow.idl>
diff --git a/offapi/com/sun/star/document/FilterAdapter.idl b/offapi/com/sun/star/document/FilterAdapter.idl
index 7a561f5..f2a4d7d 100644
--- a/offapi/com/sun/star/document/FilterAdapter.idl
+++ b/offapi/com/sun/star/document/FilterAdapter.idl
@@ -16,8 +16,8 @@
  *   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_DOCUMENT_FILTERADAPTOR_IDL__
-#define _COM_SUN_STAR_DOCUMENT_FILTERADAPTOR_IDL__
+#ifndef _COM_SUN_STAR_DOCUMENT_FILTERADAPTER_IDL__
+#define _COM_SUN_STAR_DOCUMENT_FILTERADAPTER_IDL__
 
 #include <com/sun/star/document/XFilterAdapter.idl>
 
diff --git a/offapi/com/sun/star/document/FilterOptionsRequest.idl b/offapi/com/sun/star/document/FilterOptionsRequest.idl
index bf20d75..2bf5368 100644
--- a/offapi/com/sun/star/document/FilterOptionsRequest.idl
+++ b/offapi/com/sun/star/document/FilterOptionsRequest.idl
@@ -16,8 +16,8 @@
  *   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_document_AmbigousFilterRequest_idl__
-#define __com_sun_star_document_AmbigousFilterRequest_idl__
+#ifndef __com_sun_star_document_FilterOptionsRequest_idl__
+#define __com_sun_star_document_FilterOptionsRequest_idl__
 
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/beans/PropertyValue.idl>
diff --git a/offapi/com/sun/star/document/XCmisDocument.idl b/offapi/com/sun/star/document/XCmisDocument.idl
index fabd69f..d1a94f9 100644
--- a/offapi/com/sun/star/document/XCmisDocument.idl
+++ b/offapi/com/sun/star/document/XCmisDocument.idl
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef __com_sun_star_document_XCmisDataSupplier_idl__
-#define __com_sun_star_document_XCmisDataSupplier_idl__
+#ifndef __com_sun_star_document_XCmisDocument_idl__
+#define __com_sun_star_document_XCmisDocument_idl__
 
 #include <com/sun/star/beans/PropertyValues.idl>
 #include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/document/XDocumentRecovery.idl b/offapi/com/sun/star/document/XDocumentRecovery.idl
index 6213b5a..691138d 100644
--- a/offapi/com/sun/star/document/XDocumentRecovery.idl
+++ b/offapi/com/sun/star/document/XDocumentRecovery.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __offapcom_sun_star_document_XDocumentRecovery_idl__
-#define __offapcom_sun_star_document_XDocumentRecovery_idl__
+#ifndef __com_sun_star_document_XDocumentRecovery_idl__
+#define __com_sun_star_document_XDocumentRecovery_idl__
 
 #include <com/sun/star/beans/PropertyValue.idl>
 #include <com/sun/star/io/IOException.idl>
diff --git a/offapi/com/sun/star/document/XFilterAdapter.idl b/offapi/com/sun/star/document/XFilterAdapter.idl
index 846e3b7..2267820 100644
--- a/offapi/com/sun/star/document/XFilterAdapter.idl
+++ b/offapi/com/sun/star/document/XFilterAdapter.idl
@@ -16,8 +16,8 @@
  *   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_DOCUMENT_XFILTERADAPTOR_IDL__
-#define _COM_SUN_STAR_DOCUMENT_XFILTERADAPTOR_IDL__
+#ifndef _COM_SUN_STAR_DOCUMENT_XFILTERADAPTER_IDL__
+#define _COM_SUN_STAR_DOCUMENT_XFILTERADAPTER_IDL__
 
 #include <com/sun/star/uno/RuntimeException.idl>
 #include <com/sun/star/uno/XInterface.idl>
diff --git a/offapi/com/sun/star/document/XStorageBasedDocument.idl b/offapi/com/sun/star/document/XStorageBasedDocument.idl
index 4e547ab..0819fe2 100644
--- a/offapi/com/sun/star/document/XStorageBasedDocument.idl
+++ b/offapi/com/sun/star/document/XStorageBasedDocument.idl
@@ -16,8 +16,8 @@
  *   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_embed_XStorageBasedDocument_idl__
-#define __com_sun_star_embed_XStorageBasedDocument_idl__
+#ifndef __com_sun_star_document_XStorageBasedDocument_idl__
+#define __com_sun_star_document_XStorageBasedDocument_idl__
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/embed/XStorage.idl>
diff --git a/offapi/com/sun/star/document/XVbaMethodParameter.idl b/offapi/com/sun/star/document/XVbaMethodParameter.idl
index e793947..3cd8467 100644
--- a/offapi/com/sun/star/document/XVbaMethodParameter.idl
+++ b/offapi/com/sun/star/document/XVbaMethodParameter.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __org_openoffice_vba_XVbaMethodParameter_idl__
-#define __org_openoffice_vba_XVbaMethodParameter_idl__
+#ifndef __com_sun_star_document_XVbaMethodParameter_idl__
+#define __com_sun_star_document_XVbaMethodParameter_idl__
 
 #include <com/sun/star/uno/XInterface.idl>
 
diff --git a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
index 2ca933e..4a75794 100644
--- a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
+#ifndef __com_sun_star_drawing_AccessibleDrawDocumentView_idl__
+#define __com_sun_star_drawing_AccessibleDrawDocumentView_idl__
 
 #include <com/sun/star/accessibility/XAccessible.idl>
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
diff --git a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
index b916348..f24e51f 100644
--- a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
+#ifndef __com_sun_star_drawing_AccessibleOLEShape_idl__
+#define __com_sun_star_drawing_AccessibleOLEShape_idl__
 
 #include <com/sun/star/drawing/AccessibleShape.idl>
 #include <com/sun/star/accessibility/XAccessibleAction.idl>
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideView.idl b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
index 86a8013..6ff4838 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
+#ifndef __com_sun_star_drawing_AccessibleSlideView_idl__
+#define __com_sun_star_drawing_AccessibleSlideView_idl__
 
 #include <com/sun/star/accessibility/XAccessible.idl>
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
index 96dbaab..952a30c 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
-#define __com_sun_star_drawing_AccessibleGraphicShape_idl__
+#ifndef __com_sun_star_drawing_AccessibleSlideViewObject_idl__
+#define __com_sun_star_drawing_AccessibleSlideViewObject_idl__
 
 #include <com/sun/star/accessibility/XAccessible.idl>
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl
index 79e3178..00da71a 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl
@@ -16,8 +16,8 @@
  *   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_drawing_EnhancedCustomShapeSegmentInformationCommand_idl__
-#define __com_sun_star_drawing_EnhancedCustomShapeSegmentInformationCommand_idl__
+#ifndef __com_sun_star_drawing_EnhancedCustomShapeSegmentCommand_idl__
+#define __com_sun_star_drawing_EnhancedCustomShapeSegmentCommand_idl__
 
 
 
diff --git a/offapi/com/sun/star/drawing/XSlideSorterBase.idl b/offapi/com/sun/star/drawing/XSlideSorterBase.idl
index afb96a1..339a0f0 100644
--- a/offapi/com/sun/star/drawing/XSlideSorterBase.idl
+++ b/offapi/com/sun/star/drawing/XSlideSorterBase.idl
@@ -20,24 +20,12 @@
 #ifndef __com_sun_star_drawing_XSlideSorterBase_idl__
 #define __com_sun_star_drawing_XSlideSorterBase_idl__
 
-#ifndef __com_sun_star_drawing_framework_XView_idl__
 #include <com/sun/star/drawing/framework/XView.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawView_idl__
 #include <com/sun/star/drawing/XDrawView.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 module com {  module sun {  module star {  module drawing {
 
diff --git a/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl b/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
index ca9775c..38fcb79 100644
--- a/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
+++ b/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_drawing_framework_ResourceSearchMode_idl__
-#define __com_sun_star_drawing_framework_ResourceSearchMode_idl__
+#ifndef __com_sun_star_drawing_framework_AnchorBindingMode_idl__
+#define __com_sun_star_drawing_framework_AnchorBindingMode_idl__
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/util/XCloneable.idl>
diff --git a/offapi/com/sun/star/drawing/framework/Configuration.idl b/offapi/com/sun/star/drawing/framework/Configuration.idl
index b2bf634..2381db5 100644
--- a/offapi/com/sun/star/drawing/framework/Configuration.idl
+++ b/offapi/com/sun/star/drawing/framework/Configuration.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_drawing_framework_ConfigurationController_idl__
-#define __com_sun_star_drawing_framework_ConfigurationController_idl__
+#ifndef __com_sun_star_drawing_framework_Configuration_idl__
+#define __com_sun_star_drawing_framework_Configuration_idl__
 
 #include <com/sun/star/drawing/framework/XConfiguration.idl>
 
diff --git a/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl b/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl
index 551d1c8..09b7b0b 100644
--- a/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl
+++ b/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl
@@ -19,25 +19,11 @@
 #ifndef __com_sun_star_embed_XEncryptionProtectedStorage_idl__
 #define __com_sun_star_embed_XEncryptionProtectedStorage_idl__
 
-#ifndef __com_sun_star_embed_XEncryptionProtectedSource2_idl__
 #include <com/sun/star/embed/XEncryptionProtectedSource2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_xml_crypto_DigestID_idl__
 #include <com/sun/star/xml/crypto/DigestID.idl>
-#endif
-
-#ifndef __com_sun_star_xml_crypto_CipherID_idl__
 #include <com/sun/star/xml/crypto/CipherID.idl>
-#endif
 
 
 module com {  module sun {  module star {  module embed {
diff --git a/offapi/com/sun/star/form/control/CheckBox.idl b/offapi/com/sun/star/form/control/CheckBox.idl
index dfb1471..24aa1d3 100644
--- a/offapi/com/sun/star/form/control/CheckBox.idl
+++ b/offapi/com/sun/star/form/control/CheckBox.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_form_component_checkbox_idl__
-#define __com_sun_star_form_component_checkbox_idl__
+#ifndef __com_sun_star_form_control_checkbox_idl__
+#define __com_sun_star_form_control_checkbox_idl__
 
 #include <com/sun/star/awt/UnoControlCheckBox.idl>
 #include <com/sun/star/form/XBoundControl.idl>
diff --git a/offapi/com/sun/star/form/control/InteractionGridControl.idl b/offapi/com/sun/star/form/control/InteractionGridControl.idl
index 827dd67..f8daf14 100644
--- a/offapi/com/sun/star/form/control/InteractionGridControl.idl
+++ b/offapi/com/sun/star/form/control/InteractionGridControl.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_form_component_InteractionGridControl_idl__
-#define __com_sun_star_form_component_InteractionGridControl_idl__
+#ifndef __com_sun_star_form_control_InteractionGridControl_idl__
+#define __com_sun_star_form_control_InteractionGridControl_idl__
 
 #include <com/sun/star/form/control/GridControl.idl>
 #include <com/sun/star/frame/XDispatch.idl>
diff --git a/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl b/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
index b88e2b4..e66018b 100644
--- a/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
+++ b/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_form_ButtonNavigationHandler_idl__
-#define __com_sun_star_form_ButtonNavigationHandler_idl__
+#ifndef __com_sun_star_form_inspection_ButtonNavigationHandler_idl__
+#define __com_sun_star_form_inspection_ButtonNavigationHandler_idl__
 
 #include <com/sun/star/inspection/XPropertyHandler.idl>
 
diff --git a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
index ebf1631..6be1800 100644
--- a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
+++ b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
@@ -16,8 +16,8 @@
  *   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_form_DefaultFormComponentInspectorModel_idl__
-#define __com_sun_star_form_DefaultFormComponentInspectorModel_idl__
+#ifndef __com_sun_star_form_inspection_DefaultFormComponentInspectorModel_idl__
+#define __com_sun_star_form_inspection_DefaultFormComponentInspectorModel_idl__
 
 #include <com/sun/star/inspection/XObjectInspectorModel.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
diff --git a/offapi/com/sun/star/form/inspection/EventHandler.idl b/offapi/com/sun/star/form/inspection/EventHandler.idl
index 8846215..1f40182 100644
--- a/offapi/com/sun/star/form/inspection/EventHandler.idl
+++ b/offapi/com/sun/star/form/inspection/EventHandler.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_form_EventHandler_idl__
-#define __com_sun_star_form_EventHandler_idl__
+#ifndef __com_sun_star_form_inspection_EventHandler_idl__
+#define __com_sun_star_form_inspection_EventHandler_idl__
 
 #include <com/sun/star/inspection/XPropertyHandler.idl>
 
diff --git a/offapi/com/sun/star/form/runtime/FormController.idl b/offapi/com/sun/star/form/runtime/FormController.idl
index cf02194..1f92344 100644
--- a/offapi/com/sun/star/form/runtime/FormController.idl
+++ b/offapi/com/sun/star/form/runtime/FormController.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __offapi_com_sun_star_form_runtime_FormController_idl__
-#define __offapi_com_sun_star_form_runtime_FormController_idl__
+#ifndef __com_sun_star_form_runtime_FormController_idl__
+#define __com_sun_star_form_runtime_FormController_idl__
 
 #include <com/sun/star/form/runtime/XFormController.idl>
 
diff --git a/offapi/com/sun/star/form/runtime/XFilterController.idl b/offapi/com/sun/star/form/runtime/XFilterController.idl
index d0d26cf..3926b60 100644
--- a/offapi/com/sun/star/form/runtime/XFilterController.idl
+++ b/offapi/com/sun/star/form/runtime/XFilterController.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __offapi_com_sun_star_form_runtime_XFilterController_idl__
-#define __offapi_com_sun_star_form_runtime_XFilterController_idl__
+#ifndef __com_sun_star_form_runtime_XFilterController_idl__
+#define __com_sun_star_form_runtime_XFilterController_idl__
 
 #include <com/sun/star/awt/XControl.idl>
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
diff --git a/offapi/com/sun/star/form/runtime/XFormController.idl b/offapi/com/sun/star/form/runtime/XFormController.idl
index 13b1f7b..0be5f66 100644
--- a/offapi/com/sun/star/form/runtime/XFormController.idl
+++ b/offapi/com/sun/star/form/runtime/XFormController.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __offapi_com_sun_star_form_runtime_XFormController_idl__
-#define __offapi_com_sun_star_form_runtime_XFormController_idl__
+#ifndef __com_sun_star_form_runtime_XFormController_idl__
+#define __com_sun_star_form_runtime_XFormController_idl__
 
 #include <com/sun/star/awt/XTabController.idl>
 #include <com/sun/star/container/XChild.idl>
diff --git a/offapi/com/sun/star/form/runtime/XFormControllerContext.idl b/offapi/com/sun/star/form/runtime/XFormControllerContext.idl
index 2ddaa8d..b4e0cde 100644
--- a/offapi/com/sun/star/form/runtime/XFormControllerContext.idl
+++ b/offapi/com/sun/star/form/runtime/XFormControllerContext.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __offapi_com_sun_star_form_runtime_XFormControllerContext_idl__
-#define __offapi_com_sun_star_form_runtime_XFormControllerContext_idl__
+#ifndef __com_sun_star_form_runtime_XFormControllerContext_idl__
+#define __com_sun_star_form_runtime_XFormControllerContext_idl__
 
 #include <com/sun/star/awt/XControl.idl>
 
diff --git a/offapi/com/sun/star/formula/AccessibleFormulaView.idl b/offapi/com/sun/star/formula/AccessibleFormulaView.idl
index 39b2460..942c9b6 100644
--- a/offapi/com/sun/star/formula/AccessibleFormulaView.idl
+++ b/offapi/com/sun/star/formula/AccessibleFormulaView.idl
@@ -16,8 +16,8 @@
  *   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_formula_AccessibleFormulaView__
-#define __com_sun_star_formula_AccessibleFormulaView__
+#ifndef __com_sun_star_formula_AccessibleFormulaView_idl__
+#define __com_sun_star_formula_AccessibleFormulaView_idl__
 
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
diff --git a/offapi/com/sun/star/formula/SymbolDescriptor.idl b/offapi/com/sun/star/formula/SymbolDescriptor.idl
index f4224d8..37951f7 100644
--- a/offapi/com/sun/star/formula/SymbolDescriptor.idl
+++ b/offapi/com/sun/star/formula/SymbolDescriptor.idl
@@ -16,8 +16,8 @@
  *   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_formula_Symbol_idl__
-#define __com_sun_star_formula_Symbol_idl__
+#ifndef __com_sun_star_formula_SymbolDescriptor_idl__
+#define __com_sun_star_formula_SymbolDescriptor_idl__
 
 
  module com {  module sun {  module star {  module formula {
diff --git a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
index 60fcc5c..c964023 100644
--- a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
+++ b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_frame_LayoutManager_idl__
-#define __com_sun_star_frame_LayoutManager_idl__
+#ifndef __com_sun_star_frame_XMenuBarAcceptor_idl__
+#define __com_sun_star_frame_XMenuBarAcceptor_idl__
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/awt/XMenuBar.idl>
diff --git a/offapi/com/sun/star/frame/status/ItemStatus.idl b/offapi/com/sun/star/frame/status/ItemStatus.idl
index bbf6cfe..76704f3 100644
--- a/offapi/com/sun/star/frame/status/ItemStatus.idl
+++ b/offapi/com/sun/star/frame/status/ItemStatus.idl
@@ -16,8 +16,8 @@
  *   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_frame_status_ItemState_idl__
-#define __com_sun_star_frame_status_ItemState_idl__
+#ifndef __com_sun_star_frame_status_ItemStatus_idl__
+#define __com_sun_star_frame_status_ItemStatus_idl__
 
 
 module com {  module sun {  module star {  module frame { module status {
diff --git a/offapi/com/sun/star/i18n/OrdinalSuffix.idl b/offapi/com/sun/star/i18n/OrdinalSuffix.idl
index fadac75..6f629cb 100644
--- a/offapi/com/sun/star/i18n/OrdinalSuffix.idl
+++ b/offapi/com/sun/star/i18n/OrdinalSuffix.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_com_sun_star_i18n_OrdinalSuffix_idl
-#define INCLUDED_com_sun_star_i18n_OrdinalSuffix_idl
+#ifndef __com_sun_star_i18n_OrdinalSuffix_idl__
+#define __com_sun_star_i18n_OrdinalSuffix_idl__
 
 #include <com/sun/star/i18n/XOrdinalSuffix.idl>
 
diff --git a/offapi/com/sun/star/i18n/TextConversionResult.idl b/offapi/com/sun/star/i18n/TextConversionResult.idl
index f043e15..86bd06d 100644
--- a/offapi/com/sun/star/i18n/TextConversionResult.idl
+++ b/offapi/com/sun/star/i18n/TextConversionResult.idl
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __com_sun_star_i18n_XTextConversionResult_idl__
-#define __com_sun_star_i18n_XTextConversionResult_idl__

... etc. - the rest is truncated
