[Libreoffice-commits] .: 17 commits - canvas/prj cppcanvas/prj drawinglayer/prj offapi/UnoApi_offapi.mk offapi/com offapi/prj offapi/type_reference offapi/util oovbaapi/UnoApi_oovbaapi.mk oovbaapi/ooo oovbaapi/prj oovbaapi/util padmin/prj registry/tools sax/Package_inc.mk sax/prj solenv/gbuild ucbhelper/prj udkapi/com udkapi/prj udkapi/util vcl/prj xmlreader/prj xmlscript/prj

Michael Stahl mst at kemper.freedesktop.org
Mon Nov 21 13:52:27 PST 2011


 canvas/prj/d.lst                                            |    1 
 cppcanvas/prj/d.lst                                         |    2 
 drawinglayer/prj/d.lst                                      |    2 
 offapi/UnoApi_offapi.mk                                     |   62 ++
 offapi/com/sun/star/awt/tab/makefile.mk                     |   53 -
 offapi/com/sun/star/chart2/Axis.idl                         |    1 
 offapi/com/sun/star/chart2/ChartDocument.idl                |    3 
 offapi/com/sun/star/chart2/CoordinateSystem.idl             |    4 
 offapi/com/sun/star/chart2/DataPoint.idl                    |    3 
 offapi/com/sun/star/chart2/DataPointProperties.idl          |   10 
 offapi/com/sun/star/chart2/DataSeries.idl                   |    8 
 offapi/com/sun/star/chart2/Diagram.idl                      |    4 
 offapi/com/sun/star/chart2/ErrorBar.idl                     |    7 
 offapi/com/sun/star/chart2/ExponentialScaling.idl           |    2 
 offapi/com/sun/star/chart2/FormattedString.idl              |    7 
 offapi/com/sun/star/chart2/GridProperties.idl               |    2 
 offapi/com/sun/star/chart2/Legend.idl                       |    1 
 offapi/com/sun/star/chart2/LinearScaling.idl                |    2 
 offapi/com/sun/star/chart2/LogarithmicScaling.idl           |    2 
 offapi/com/sun/star/chart2/MutableDataSequence.idl          |   62 --
 offapi/com/sun/star/chart2/PowerScaling.idl                 |    2 
 offapi/com/sun/star/chart2/RegressionCurveEquation.idl      |    2 
 offapi/com/sun/star/chart2/TextAnchor.idl                   |   51 -
 offapi/com/sun/star/chart2/Title.idl                        |    5 
 offapi/com/sun/star/chart2/XFastPropertyState.idl           |  135 ----
 offapi/com/sun/star/chart2/XStyleSupplier.idl               |   69 --
 offapi/com/sun/star/chart2/data/RangeHighlighter.idl        |    2 
 offapi/com/sun/star/document/makefile.mk                    |  133 ----
 offapi/com/sun/star/embed/makefile.mk                       |  120 ----
 offapi/com/sun/star/frame/XToolbarControllerListener.idl    |    2 
 offapi/com/sun/star/graphic/makefile.mk                     |   64 --
 offapi/com/sun/star/mail/MailServer.idl                     |   63 --
 offapi/com/sun/star/mail/SendMailMessageFailedException.idl |    2 
 offapi/com/sun/star/mail/XConnectionListener.idl            |    2 
 offapi/com/sun/star/mail/XMailMessage.idl                   |    2 
 offapi/com/sun/star/mail/XMailServer.idl                    |  235 -------
 offapi/com/sun/star/rendering/makefile.mk                   |  118 ----
 offapi/com/sun/star/script/makefile.mk                      |   60 --
 offapi/com/sun/star/script/vba/makefile.mk                  |   57 -
 offapi/com/sun/star/security/makefile.mk                    |   73 --
 offapi/com/sun/star/sheet/makefile.mk                       |  354 ------------
 offapi/com/sun/star/style/FootnoteLineStyle.idl             |    6 
 offapi/com/sun/star/style/makefile.mk                       |   88 --
 offapi/com/sun/star/table/makefile.mk                       |   97 ---
 offapi/com/sun/star/xml/crypto/makefile.mk                  |   72 --
 offapi/prj/d.lst                                            |  224 -------
 offapi/type_reference/types.rdb                             |binary
 offapi/util/makefile.mk                                     |  194 ------
 oovbaapi/UnoApi_oovbaapi.mk                                 |    5 
 oovbaapi/ooo/vba/constants/makefile.mk                      |   59 --
 oovbaapi/ooo/vba/excel/Button.idl                           |   61 ++
 oovbaapi/ooo/vba/excel/SheetObject.idl                      |   62 --
 oovbaapi/ooo/vba/excel/makefile.mk                          |  116 ---
 oovbaapi/ooo/vba/makefile.mk                                |   74 --
 oovbaapi/ooo/vba/msforms/makefile.mk                        |   75 --
 oovbaapi/ooo/vba/word/makefile.mk                           |  111 ---
 oovbaapi/prj/d.lst                                          |   15 
 oovbaapi/util/makefile.pmk                                  |   32 -
 padmin/prj/d.lst                                            |    1 
 registry/tools/regcompare.cxx                               |   18 
 sax/Package_inc.mk                                          |    1 
 sax/prj/d.lst                                               |    2 
 solenv/gbuild/UnoApiTarget.mk                               |    5 
 ucbhelper/prj/d.lst                                         |    1 
 udkapi/com/sun/star/script/makefile.mk                      |   93 ---
 udkapi/prj/d.lst                                            |   55 -
 udkapi/util/makefile.pmk                                    |   35 -
 udkapi/util/target.pmk                                      |   34 -
 vcl/prj/d.lst                                               |    1 
 xmlreader/prj/d.lst                                         |    1 
 xmlscript/prj/d.lst                                         |    1 
 71 files changed, 185 insertions(+), 3143 deletions(-)

New commits:
commit 82dd6525a2f3b658817232169c48ce4f57362d94
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 21 18:38:02 2011 +0100

    offapi: re-activate the reference type rdb check

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 34ed6f3..5511ec5 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -212,7 +212,7 @@ $(call gb_UnoApiTarget_get_target,%):
 	$(call gb_Output_announce,$*,$(true),RDB,3)
 	$(if $(gb_UnoApiTarget_IDLFILES_$*),$(call gb_UnoApiTarget__command,$@,$*,$<,UCR,$(addprefix $(call gb_UnoApiPartTarget_get_target,),$(patsubst %.idl,%.urd,$(gb_UnoApiTarget_IDLFILES_$*)))))
 	$(if $(UNOAPI_MERGE),$(call gb_UnoApiTarget__command,$@,$*,$<,/,$(UNOAPI_MERGE)))
-	$(if $(and $(false),$(UNOAPI_REFERENCE)), \
+	$(if $(UNOAPI_REFERENCE), \
 		$(call gb_Output_announce,$*,$(true),RDBCHEK,4) \
 	    $(gb_UnoApiTarget_REGCOMPARECOMMAND) -f -t -r1 $(call gb_Helper_convert_native,$(UNOAPI_REFERENCE)) -r2 $(call gb_Helper_convert_native,$@))
 	$(if $(gb_UnoApiTarget_IDLFILES_$*), \
commit f1d0641013c9bab9963a7cdbfadf56b44d290be9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 21 18:33:58 2011 +0100

    offapi: update type reference:
    
    This updates the keys for the following intentional changes:
    
    ENUM: /UCR/com/sun/star/drawing/TextFitToSizeType
      Field 3: Name1 = RESIZEATTR  !=  Name2 = AUTOFIT
    SERVICE: /UCR/com/sun/star/sheet/SpreadsheetViewSettings
      SERVICE1 contains 1 more properties as SERVICE2
      incompatible change: Field 14 ('SolidHandles') of r1 is not longer a property of this SERVICE in r2
    SERVICE: /UCR/com/sun/star/text/ViewSettings
      SERVICE1 contains 1 more properties as SERVICE2
      incompatible change: Field 24 ('SolidMarkHandles') of r1 is not longer a property of this SERVICE in r2

diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 1f9d5ae..5fd80a1 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
commit 83e82d2d5929f8f4923049593ab976f88ce67294
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 21 18:21:19 2011 +0100

    UnoApiTarget: document add functions a bit

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index d90090b..34ed6f3 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -74,6 +74,7 @@ $(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : $(foreach idl,$(3),$(SRCD
 
 endef
 
+# for interfaces, exceptions, structs, enums, constant groups
 define gb_UnoApiTarget_add_idlfile
 $(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd)
 $(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd) : $(call gb_UnoApiPartTarget_get_target,$(2)/idl.done)
@@ -94,6 +95,7 @@ $(call gb_UnoApiPartTarget_get_target,$(2)/idl_noheader.done) : $(foreach idl,$(
 
 endef
 
+# for old-style services and modules
 define gb_UnoApiTarget_add_idlfile_noheader
 $(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd)
 $(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd) : $(call gb_UnoApiPartTarget_get_target,$(2)/idl_noheader.done)
@@ -109,6 +111,7 @@ $(call gb_UnoApiPartTarget_get_target,$(2)/idl_nohdl.done) : $(foreach idl,$(3),
 
 endef
 
+# for new-style services
 define gb_UnoApiTarget_add_idlfile_nohdl
 $(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd)
 $(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd) : $(call gb_UnoApiPartTarget_get_target,$(2)/idl_nohdl.done)
commit d4be9c7a2bfb8d682c4a2c781e5c58b72be47b6a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 21 18:21:04 2011 +0100

    regcompare: fix error reporting:
    
    Function checkField() is called from 2 different contexts, one of
    which must not report errors, but the other should.

diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index 44f725c..1cba906 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -630,6 +630,7 @@ static sal_uInt32 checkConstValue(Options_Impl const & options,
     return 0;
 }
 
+enum verbosity_t {SILENT, REPORT};
 static sal_uInt32 checkField(Options_Impl const & options,
                              const OUString& keyName,
                              RTTypeClass typeClass,
@@ -637,12 +638,13 @@ static sal_uInt32 checkField(Options_Impl const & options,
                              typereg::Reader& reader1,
                              typereg::Reader& reader2,
                              sal_uInt16 index1,
-                             sal_uInt16 index2)
+                             sal_uInt16 index2,
+                             verbosity_t const eVerbosity)
 {
     sal_uInt32 nError = 0;
     if ( reader1.getFieldName(index1) != reader2.getFieldName(index2) )
     {
-        if ( options.forceOutput() && !options.unoTypeCheck() )
+        if (options.forceOutput() && (REPORT == eVerbosity))
         {
             dumpTypeClass (bDump, typeClass, keyName);
             fprintf(stdout, "  Field %d: Name1 = %s  !=  Name2 = %s\n", index1,
@@ -652,7 +654,7 @@ static sal_uInt32 checkField(Options_Impl const & options,
     }
     if ( reader1.getFieldTypeName(index1) != reader2.getFieldTypeName(index2) )
     {
-        if ( options.forceOutput() && !options.unoTypeCheck() )
+        if (options.forceOutput() && (REPORT == eVerbosity))
         {
             dumpTypeClass (bDump, typeClass, keyName);
             fprintf(stdout, "  Field %d: Type1 = %s  !=  Type2 = %s\n", index1,
@@ -666,7 +668,7 @@ static sal_uInt32 checkField(Options_Impl const & options,
         RTConstValue constValue2 = reader2.getFieldValue(index2);
         if ( constValue1.m_type != constValue2.m_type )
         {
-            if ( options.forceOutput() && !options.unoTypeCheck() )
+            if (options.forceOutput() && (REPORT == eVerbosity))
             {
                 dumpTypeClass (bDump, typeClass, keyName);
                 fprintf(stdout, "  Field %d: Access1 = %s  !=  Access2 = %s\n", index1,
@@ -687,7 +689,7 @@ static sal_uInt32 checkField(Options_Impl const & options,
 
     if ( reader1.getFieldFlags(index1) != reader2.getFieldFlags(index2) )
     {
-        if ( options.forceOutput() && !options.unoTypeCheck() )
+        if (options.forceOutput() && (REPORT == eVerbosity))
         {
             dumpTypeClass (bDump, typeClass, keyName);
             fprintf(stdout, "  Field %d: FieldAccess1 = %s  !=  FieldAccess2 = %s\n", index1,
@@ -699,7 +701,7 @@ static sal_uInt32 checkField(Options_Impl const & options,
 
     if ( options.fullCheck() && (reader1.getFieldDocumentation(index1) != reader2.getFieldDocumentation(index2)) )
     {
-        if ( options.forceOutput() && !options.unoTypeCheck() )
+        if (options.forceOutput() && (REPORT == eVerbosity))
         {
             dumpTypeClass (bDump, typeClass, keyName);
             fprintf(stdout, "  Field %d: Doku1 = %s\n             Doku2 = %s\n", index1,
@@ -1000,7 +1002,7 @@ static sal_uInt32 checkFieldsWithoutOrder(Options_Impl const & options,
     {
         for (j=0; j < nFields2; j++)
         {
-            if (!checkField(options, keyName, typeClass, bDump, reader1, reader2, i, j))
+            if (!checkField(options, keyName, typeClass, bDump, reader1, reader2, i, j, SILENT))
             {
                 bFound =  sal_True;
                 moreProps.insert(j);
@@ -1162,7 +1164,7 @@ static sal_uInt32 checkBlob(
         sal_uInt16 i;
         for (i=0; i < nFields1 && i < nFields2; i++)
         {
-            nError += checkField(options, keyName, typeClass, bDump, reader1, reader2, i, i);
+            nError += checkField(options, keyName, typeClass, bDump, reader1, reader2, i, i, REPORT);
         }
         if ( i < nFields1 && options.forceOutput() )
         {
commit d63d64c4dea4d29592d21ff2841fc4df25a8373d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 21 16:28:48 2011 +0100

    empty a bunch of d.lst files

diff --git a/canvas/prj/d.lst b/canvas/prj/d.lst
index cde5ebe..e69de29 100644
--- a/canvas/prj/d.lst
+++ b/canvas/prj/d.lst
@@ -1 +0,0 @@
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
diff --git a/cppcanvas/prj/d.lst b/cppcanvas/prj/d.lst
index c103198..e69de29 100644
--- a/cppcanvas/prj/d.lst
+++ b/cppcanvas/prj/d.lst
@@ -1,2 +0,0 @@
-..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.*
-..\%__SRC%\misc\mtfrenderer.component %_DEST%\xml\mtfrenderer.component
diff --git a/drawinglayer/prj/d.lst b/drawinglayer/prj/d.lst
index b384ab6..e69de29 100644
--- a/drawinglayer/prj/d.lst
+++ b/drawinglayer/prj/d.lst
@@ -1,2 +0,0 @@
-
-..\inc\drawinglayer\primitive2d\rendergraphicprimitive2d.hxx %_DEST%\inc\drawinglayer\primitive2d\rendergraphicprimitive2d.hxx
\ No newline at end of file
diff --git a/padmin/prj/d.lst b/padmin/prj/d.lst
index 8b13789..e69de29 100644
--- a/padmin/prj/d.lst
+++ b/padmin/prj/d.lst
@@ -1 +0,0 @@
-
diff --git a/sax/Package_inc.mk b/sax/Package_inc.mk
index 1511205..9dd0444 100644
--- a/sax/Package_inc.mk
+++ b/sax/Package_inc.mk
@@ -31,5 +31,6 @@ $(eval $(call gb_Package_add_file,sax_inc,inc/sax/dllapi.h,sax/dllapi.h))
 $(eval $(call gb_Package_add_file,sax_inc,inc/sax/fshelper.hxx,sax/fshelper.hxx))
 $(eval $(call gb_Package_add_file,sax_inc,inc/sax/fastattribs.hxx,sax/fastattribs.hxx))
 $(eval $(call gb_Package_add_file,sax_inc,inc/sax/tools/converter.hxx,sax/tools/converter.hxx))
+$(eval $(call gb_Package_add_file,sax_inc,inc/sax/tools/documenthandleradapter.hxx,sax/tools/documenthandleradapter.hxx))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sax/prj/d.lst b/sax/prj/d.lst
index 54fab39..e69de29 100644
--- a/sax/prj/d.lst
+++ b/sax/prj/d.lst
@@ -1,2 +0,0 @@
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\inc\sax\tools\documenthandleradapter.hxx %_DEST%\inc\sax\tools\documenthandleradapter.hxx
diff --git a/ucbhelper/prj/d.lst b/ucbhelper/prj/d.lst
index 2a89bcd..e69de29 100644
--- a/ucbhelper/prj/d.lst
+++ b/ucbhelper/prj/d.lst
@@ -1 +0,0 @@
-..\%__SRC%\misc\*.sym %_DEST%\bin\*.sym
diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst
index 8b13789..e69de29 100644
--- a/vcl/prj/d.lst
+++ b/vcl/prj/d.lst
@@ -1 +0,0 @@
-
diff --git a/xmlreader/prj/d.lst b/xmlreader/prj/d.lst
index a4c0608..e69de29 100644
--- a/xmlreader/prj/d.lst
+++ b/xmlreader/prj/d.lst
@@ -1 +0,0 @@
-..\%__SRC%\lib\libxmlreader.dll.a %_DEST%\lib\libxmlreader.dll.a
diff --git a/xmlscript/prj/d.lst b/xmlscript/prj/d.lst
index cde5ebe..e69de29 100644
--- a/xmlscript/prj/d.lst
+++ b/xmlscript/prj/d.lst
@@ -1 +0,0 @@
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
commit aec495fb1f4f32029c243df1823987ab2c912a02
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 21 16:16:01 2011 +0100

    oovbaapi: kill dmakefiles

diff --git a/oovbaapi/ooo/vba/constants/makefile.mk b/oovbaapi/ooo/vba/constants/makefile.mk
deleted file mode 100755
index dbe2213..0000000
--- a/oovbaapi/ooo/vba/constants/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=oovbapi
-
-TARGET=constants
-PACKAGE=org$/vba$/constants
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-.IF "$(L10N_framework)"==""
-# ------------------------------------------------------------------------
-MY_GEN_IDL_PATH=$(MISC)$/idl
-MY_GEN_UCR_PATH=$(OUT)$/ucr$/$(PACKAGE)
-MYTMPIDLFILES=$(shell @ls $(MY_GEN_IDL_PATH))
-MYIDLFILES=$(foreach,i,$(MYTMPIDLFILES) $(MY_GEN_IDL_PATH)$/$(i))
-MYURDFILES=$(foreach,i,$(MYIDLFILES) $(MY_GEN_UCR_PATH)$/$(i:b).urd)
-MYDBTARGET=$(OUT)$/ucr/constants.db
-.ENDIF
-
-.INCLUDE :  target.mk
-
-.IF "$(L10N_framework)"==""
-ALLTAR: $(MYDBTARGET)
-
-$(MY_GEN_UCR_PATH)$/%.urd: $(MY_GEN_IDL_PATH)$/%.idl
-    $(IDLC) -C -O $(MY_GEN_UCR_PATH) -I $(MY_GEN_IDL_PATH) -I $(SOLARIDLDIR) $?
-
-$(MYDBTARGET) : $(MYURDFILES)  $(MYIDLFILES)
-    $(REGMERGE) $(OUT)$/ucr/constants.db /UCR @$(mktmp $(MYURDFILES))
-
-.ENDIF
diff --git a/oovbaapi/ooo/vba/excel/makefile.mk b/oovbaapi/ooo/vba/excel/makefile.mk
deleted file mode 100755
index 428062f..0000000
--- a/oovbaapi/ooo/vba/excel/makefile.mk
+++ /dev/null
@@ -1,116 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=oovapi
-
-TARGET=excel
-PACKAGE=ooo$/vba$/excel
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-
-IDLFILES= XGlobals.idl\
-    Globals.idl\
-    SheetObject.idl\
-    SheetObjects.idl\
-    XApplication.idl\
-    XComment.idl\
-    XComments.idl\
-    XRange.idl\
-    XWorkbook.idl\
-    XWorkbooks.idl\
-    XWorksheet.idl\
-    XWorksheets.idl\
-    XFont.idl\
-    XOutline.idl\
-    XInterior.idl\
-    XWorksheetFunction.idl\
-    XWindow.idl\
-    XChartObject.idl\
-    XChartObjects.idl\
-    XChart.idl\
-    XCharts.idl\
-    XSeriesCollection.idl\
-    XSeries.idl\
-    XDialog.idl \
-    XPivotTables.idl \
-    XPivotTable.idl \
-    XPivotCache.idl \
-    XDialogs.idl \
-    XWindows.idl \
-    XBorder.idl \
-    XBorders.idl \
-    XCharacters.idl \
-    XValidation.idl\
-    XOLEObject.idl\
-    XOLEObjects.idl\
-    XPane.idl\
-    XTextFrame.idl\
-    XTitle.idl\
-    XChartTitle.idl\
-    XDataLabel.idl\
-    XDataLabels.idl\
-    XAxes.idl\
-    XAxis.idl\
-    XAxisTitle.idl\
-    XStyle.idl \
-    XStyles.idl \
-    XFormat.idl \
-    XFormatCondition.idl \
-    XFormatConditions.idl \
-    Range.idl\
-    XName.idl\
-    XNames.idl \
-    Workbook.idl \
-    Worksheet.idl \
-    Window.idl \
-     XHyperlink.idl \
-     Hyperlink.idl \
-     XHyperlinks.idl \
-     XPageSetup.idl \
-     XPageBreak.idl \
-     XHPageBreak.idl \
-     XHPageBreaks.idl \
-     XVPageBreak.idl \
-     XVPageBreaks.idl \
-     TextFrame.idl \
-    XMenuBar.idl \
-    XMenuBars.idl \
-    XMenu.idl \
-    XMenus.idl \
-    XMenuItem.idl \
-    XMenuItems.idl \
-    XQueryTable.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/oovbaapi/ooo/vba/makefile.mk b/oovbaapi/ooo/vba/makefile.mk
deleted file mode 100755
index 10281a6..0000000
--- a/oovbaapi/ooo/vba/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
- #*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=oovbapi
-
-TARGET=vba
-PACKAGE=ooo$/vba
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-.IF "$(L10N_framework)"=""
-IDLFILES=\
-    XErrObject.idl \
-    XCollection.idl\
-    XCollectionBase.idl\
-    XVBAToOOEventDescGen.idl\
-    XPropValue.idl\
-    XHelperInterface.idl\
-    XAssistant.idl\
-    XCommandBarControl.idl\
-    XCommandBarControls.idl\
-    XCommandBar.idl\
-    XCommandBars.idl\
-    XCommandBarPopup.idl\
-    XCommandBarButton.idl\
-    XControlProvider.idl\
-    ControlProvider.idl\
-    XApplicationBase.idl\
-    XWindowBase.idl\
-    XDocumentBase.idl\
-    XDocumentsBase.idl\
-    XGlobalsBase.idl\
-    XDocumentProperty.idl\
-    XDocumentProperties.idl\
-    XExecutableDialog.idl\
-    XFontBase.idl\
-    XDialogsBase.idl\
-    XDialogBase.idl\
-    XPageSetupBase.idl \
-    XFileSearch.idl\
-    XFoundFiles.idl\
-    XFileDialog.idl \
-    XFileDialogSelectedItems.idl
-
-# ------------------------------------------------------------------
-.ENDIF
-.INCLUDE :  target.mk
diff --git a/oovbaapi/ooo/vba/msforms/makefile.mk b/oovbaapi/ooo/vba/msforms/makefile.mk
deleted file mode 100755
index 2717d04..0000000
--- a/oovbaapi/ooo/vba/msforms/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=oovbapi
-
-TARGET=msforms
-PACKAGE=ooo$/vba$/msforms
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    MSFormReturnTypes.idl \
-    XCheckBox.idl \
-    XComboBox.idl \
-    XCommandButton.idl \
-    XControl.idl \
-    XFrame.idl \
-    XLabel.idl \
-    XNewFont.idl \
-    XTextBox.idl \
-    XRadioButton.idl \
-    XCheckBox.idl \
-    XShape.idl \
-    XShapes.idl \
-    XLineFormat.idl \
-    XColorFormat.idl \
-    XFillFormat.idl \
-    XPictureFormat.idl \
-    XShapeRange.idl \
-    XTextBoxShape.idl \
-    XUserForm.idl \
-    XListBox.idl \
-    XToggleButton.idl \
-    XScrollBar.idl \
-    XProgressBar.idl \
-    XMultiPage.idl \
-    XPages.idl \
-    XSpinButton.idl \
-    XImage.idl \
-    XControls.idl \
-    XReturnBoolean.idl \
-    XReturnInteger.idl \
-    XTextFrame.idl \
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/oovbaapi/ooo/vba/word/makefile.mk b/oovbaapi/ooo/vba/word/makefile.mk
deleted file mode 100755
index 4ed210b..0000000
--- a/oovbaapi/ooo/vba/word/makefile.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=oovapi
-
-TARGET=word
-PACKAGE=ooo$/vba$/word
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-
-IDLFILES= XGlobals.idl\
-    XApplication.idl \
-    XDocument.idl \
-    XWindow.idl \
-    XSystem.idl \
-    XRange.idl \
-    XBookmark.idl \
-    XBookmarks.idl \
-    XVariable.idl \
-    XVariables.idl \
-    XView.idl \
-    XPane.idl \
-    XPanes.idl \
-    XOptions.idl \
-    XSelection.idl \
-     XTemplate.idl \
-    XParagraphFormat.idl \
-    XAutoTextEntries.idl \
-    XAutoTextEntry.idl \
-    XParagraphs.idl \
-    XParagraph.idl \
-    XFind.idl \
-    XReplacement.idl \
-    XStyle.idl \
-    XStyles.idl \
-    XFont.idl \
-    XTable.idl \
-    XTables.idl \
-    XField.idl \
-    XFields.idl \
-    XBorder.idl \
-    XBorders.idl \
-    XDocuments.idl \
-    XHeaderFooter.idl \
-    XAddins.idl \
-    XAddin.idl \
-    XDialogs.idl \
-    XDialog.idl \
-    XWrapFormat.idl \
-    XPageSetup.idl \
-    XSection.idl \
-    XSections.idl \
-    XRow.idl \
-    XRows.idl \
-    XColumn.idl \
-    XColumns.idl \
-    XCell.idl \
-    XCells.idl \
-    XTabStop.idl \
-    XTabStops.idl \
-    XTableOfContents.idl \
-    XTablesOfContents.idl \
-    XListFormat.idl \
-    XListGalleries.idl \
-    XListGallery.idl \
-    XListTemplate.idl \
-    XListTemplates.idl \
-    XListLevel.idl \
-    XListLevels.idl \
-    XFormField.idl \
-    XFormFields.idl \
-    XRevision.idl \
-    XRevisions.idl \
-    XFrame.idl \
-    XFrames.idl \
-    XCheckBox.idl \
-    XHeadersFooters.idl \
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/oovbaapi/util/makefile.pmk b/oovbaapi/util/makefile.pmk
deleted file mode 100755
index 81737fa..0000000
--- a/oovbaapi/util/makefile.pmk
+++ /dev/null
@@ -1,32 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-LOCALIDLFILES=TRUE
commit 9747d4542c9305281885c1f7c7795e49132b3b92
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 21 16:10:10 2011 +0100

    oovbaapi: empty d.lst and add missing IDLs to makefile

diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index 340c5d0..57a0c11 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/ms
 	MSFormReturnTypes \
 ))
 $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/excel,\
+	Button \
 	SheetObjects \
 ))
 
@@ -94,6 +95,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\
 	XDocumentProperty \
 	XDocumentsBase \
 	XErrObject \
+	XExecutableDialog \
 	XFileDialog \
 	XFileDialogSelectedItems \
 	XFileSearch \
@@ -103,6 +105,8 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\
 	XHelperInterface \
 	XPageSetupBase \
 	XPropValue \
+	XVBAAppService \
+	XVBADocService \
 	XVBAToOOEventDescGen \
 	XWindowBase \
 ))
@@ -1042,6 +1046,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/word,\
 	XBorders \
 	XCell \
 	XCells \
+	XCheckBox \
 	XColumn \
 	XColumns \
 	XDialog \
diff --git a/oovbaapi/ooo/vba/excel/Button.idl b/oovbaapi/ooo/vba/excel/Button.idl
index a3cde0b..49e4b6c 100644
--- a/oovbaapi/ooo/vba/excel/Button.idl
+++ b/oovbaapi/ooo/vba/excel/Button.idl
@@ -29,8 +29,7 @@
 #define __ooo_vba_excel_Button_idl__
 
 #include <ooo/vba/excel/XSheetObject.idl>
-
-#include <ooo/vba/excel/XCharacters.idl>
+#include <ooo/vba/excel/XControlObject.idl>
 #include <ooo/vba/excel/XButton.idl>
 
 //=============================================================================
diff --git a/oovbaapi/prj/d.lst b/oovbaapi/prj/d.lst
index b560713..e69de29 100644
--- a/oovbaapi/prj/d.lst
+++ b/oovbaapi/prj/d.lst
@@ -1,15 +0,0 @@
-mkdir: %COMMON_DEST%\idl\ooo
-
-mkdir: %COMMON_DEST%\idl\ooo\vba 
-mkdir: %COMMON_DEST%\idl\ooo\vba\constants 
-mkdir: %COMMON_DEST%\idl\ooo\vba\excel 
-mkdir: %COMMON_DEST%\idl\ooo\vba\msforms
-mkdir: %COMMON_DEST%\idl\ooo\vba\word
-
-..\%__SRC%\ucr\oovbaapi.db %_DEST%\bin\oovbaapi.rdb
-
-..\ooo\vba\*.idl %COMMON_DEST%\idl\ooo\vba
-..\ooo\vba\constants\*.idl %COMMON_DEST%\idl\ooo\vba\constants 
-..\ooo\vba\excel\*.idl %COMMON_DEST%\idl\ooo\vba\excel
-..\ooo\vba\msforms\*.idl %COMMON_DEST%\idl\ooo\vba\msforms
-..\ooo\vba\word\*.idl %COMMON_DEST%\idl\ooo\vba\word
commit 71938468e8a50a76f02f5ec5c66814c03db3e198
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 21 16:05:40 2011 +0100

    oovbaapi: rename SheetObject.idl to Button.idl

diff --git a/oovbaapi/ooo/vba/excel/Button.idl b/oovbaapi/ooo/vba/excel/Button.idl
new file mode 100644
index 0000000..a3cde0b
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/Button.idl
@@ -0,0 +1,62 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __ooo_vba_excel_Button_idl__
+#define __ooo_vba_excel_Button_idl__
+
+#include <ooo/vba/excel/XSheetObject.idl>
+
+#include <ooo/vba/excel/XCharacters.idl>
+#include <ooo/vba/excel/XButton.idl>
+
+//=============================================================================
+
+/*  Note: This file collects all compatibility interfaces for drawing objects
+    and drawing controls embedded in sheets. All these symbols are deprecated
+    in VBA and kept for compatibility with old VBA scripts. */
+
+//=============================================================================
+
+module ooo {  module vba { module excel {
+
+//=============================================================================
+
+//=============================================================================
+
+/** Represents a drawing button control in a spreadsheet. */
+service Button
+{
+    interface XSheetObject;
+    interface XControlObject;
+    interface XButton;
+};
+
+//=============================================================================
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/excel/SheetObject.idl b/oovbaapi/ooo/vba/excel/SheetObject.idl
deleted file mode 100644
index 2b09cac..0000000
--- a/oovbaapi/ooo/vba/excel/SheetObject.idl
+++ /dev/null
@@ -1,62 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __ooo_vba_excel_SheetObject_idl__
-#define __ooo_vba_excel_SheetObject_idl__
-
-#include <ooo/vba/excel/XSheetObject.idl>
-
-#include <ooo/vba/excel/XCharacters.idl>
-#include <ooo/vba/excel/XButton.idl>
-
-//=============================================================================
-
-/*  Note: This file collects all compatibility interfaces for drawing objects
-    and drawing controls embedded in sheets. All these symbols are deprecated
-    in VBA and kept for compatibility with old VBA scripts. */
-
-//=============================================================================
-
-module ooo {  module vba { module excel {
-
-//=============================================================================
-
-//=============================================================================
-
-/** Represents a drawing button control in a spreadsheet. */
-service Button
-{
-    interface XSheetObject;
-    interface XControlObject;
-    interface XButton;
-};
-
-//=============================================================================
-
-}; }; };
-
-#endif
commit 4f3175bbaf5b275fb949250c0cb926b3bbf6afc7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 21 15:54:25 2011 +0100

    offapi: FootnoteLineStyle.idl: wrong module

diff --git a/offapi/com/sun/star/style/FootnoteLineStyle.idl b/offapi/com/sun/star/style/FootnoteLineStyle.idl
index 100e27f..b85b943 100644
--- a/offapi/com/sun/star/style/FootnoteLineStyle.idl
+++ b/offapi/com/sun/star/style/FootnoteLineStyle.idl
@@ -24,10 +24,10 @@
  * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
  * instead of those above.
  */
-#ifndef __com_sun_star_text_FootnoteLineStyle_idl__
-#define __com_sun_star_text_FootnoteLineStyle_idl__
+#ifndef __com_sun_star_style_FootnoteLineStyle_idl__
+#define __com_sun_star_style_FootnoteLineStyle_idl__
 
-module com {  module sun {  module star {  module text {
+module com {  module sun {  module star {  module style {
 
 published constants FootnoteLineStyle
 {
commit a4814ec65788fef70840fa56d326615d79990f46
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 21 15:25:43 2011 +0100

    offapi: fix build errors in chart2 services

diff --git a/offapi/com/sun/star/chart2/Axis.idl b/offapi/com/sun/star/chart2/Axis.idl
index d5daba1..c2c982a 100644
--- a/offapi/com/sun/star/chart2/Axis.idl
+++ b/offapi/com/sun/star/chart2/Axis.idl
@@ -28,6 +28,7 @@
 #define com_sun_star_chart_Axis_idl
 
 #include <com/sun/star/beans/PropertySet.idl>
+#include <com/sun/star/awt/Size.idl>
 #include <com/sun/star/chart/ChartAxisArrangeOrderType.idl>
 #include <com/sun/star/chart/ChartAxisPosition.idl>
 #include <com/sun/star/chart/ChartAxisLabelPosition.idl>
diff --git a/offapi/com/sun/star/chart2/ChartDocument.idl b/offapi/com/sun/star/chart2/ChartDocument.idl
index 56a04ed..b8bc0d8 100644
--- a/offapi/com/sun/star/chart2/ChartDocument.idl
+++ b/offapi/com/sun/star/chart2/ChartDocument.idl
@@ -30,7 +30,6 @@
 #include <com/sun/star/style/XStyleFamiliesSupplier.idl>
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
 #include <com/sun/star/chart2/XChartDocument.idl>
-#include <com/sun/star/chart2/XUndoSupplier.idl>
 #include <com/sun/star/chart2/data/XDataReceiver.idl>
 #include <com/sun/star/chart2/XTitled.idl>
 #include <com/sun/star/lang/XInitialization.idl>
@@ -78,8 +77,6 @@ service ChartDocument
         </ol>
      */
     [optional] interface  ::com::sun::star::lang::XInitialization;
-
-    [optional] interface XUndoSupplier;
 };
 
 } ; // chart2
diff --git a/offapi/com/sun/star/chart2/CoordinateSystem.idl b/offapi/com/sun/star/chart2/CoordinateSystem.idl
index b74aace..407b1a4 100644
--- a/offapi/com/sun/star/chart2/CoordinateSystem.idl
+++ b/offapi/com/sun/star/chart2/CoordinateSystem.idl
@@ -1,10 +1,8 @@
 #ifndef com_sun_star_chart2_CoordinateSystem_idl
 #define com_sun_star_chart2_CoordinateSystem_idl
 
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/chart2/XScale.idl>
 #include <com/sun/star/util/XCloneable.idl>
-#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
+#include <com/sun/star/chart2/XChartTypeContainer.idl>
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/DataPoint.idl b/offapi/com/sun/star/chart2/DataPoint.idl
index 5f070bd..285635b 100644
--- a/offapi/com/sun/star/chart2/DataPoint.idl
+++ b/offapi/com/sun/star/chart2/DataPoint.idl
@@ -28,7 +28,10 @@
 #define com_sun_star_chart2_DataPoint_idl
 
 #include <com/sun/star/style/CharacterProperties.idl>
+#include <com/sun/star/style/CharacterPropertiesAsian.idl>
+#include <com/sun/star/style/CharacterPropertiesComplex.idl>
 #include <com/sun/star/style/XStyle.idl>
+#include <com/sun/star/chart2/DataPointProperties.idl>
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/DataPointProperties.idl b/offapi/com/sun/star/chart2/DataPointProperties.idl
index 4893449..51dfbbd 100644
--- a/offapi/com/sun/star/chart2/DataPointProperties.idl
+++ b/offapi/com/sun/star/chart2/DataPointProperties.idl
@@ -29,12 +29,14 @@
 
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/awt/Gradient.idl>
+#include <com/sun/star/style/XStyle.idl>
 #include <com/sun/star/drawing/Hatch.idl>
 #include <com/sun/star/drawing/LineDash.idl>
-#include <com/sun/star/style/XStyle.idl>
-#include <com/sun/star/chart2/BitmapProperty.idl>
-#include <com/sun/star/chart2/TransparencyStyle.idl>
-#include <com/sun/star/chart2/DataCaptionStyle.idl>
+#include <com/sun/star/drawing/BitmapMode.idl>
+#include <com/sun/star/drawing/FillStyle.idl>
+#include <com/sun/star/drawing/LineStyle.idl>
+#include <com/sun/star/drawing/RectanglePoint.idl>
+#include <com/sun/star/chart2/DataPointLabel.idl>
 #include <com/sun/star/chart2/Symbol.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/DataSeries.idl b/offapi/com/sun/star/chart2/DataSeries.idl
index 61b0d79..2016d19 100644
--- a/offapi/com/sun/star/chart2/DataSeries.idl
+++ b/offapi/com/sun/star/chart2/DataSeries.idl
@@ -30,12 +30,12 @@
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/container/XIndexContainer.idl>
 #include <com/sun/star/container/XContainer.idl>
-#include <com/sun/star/style/XStyle.idl>
-#include <com/sun/star/chart2/CoordinateSystemSupplier.idl>
+#include <com/sun/star/chart2/DataPointProperties.idl>
+#include <com/sun/star/chart2/StackingDirection.idl>
+#include <com/sun/star/chart2/XDataSeries.idl>
+#include <com/sun/star/chart2/XRegressionCurveContainer.idl>
 #include <com/sun/star/chart2/data/XDataSink.idl>
 #include <com/sun/star/chart2/data/XDataSource.idl>
-#include <com/sun/star/chart2/data/XDataSeries.idl>
-#include <com/sun/star/chart2/XRegressionCurveContainer.idl>
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/Diagram.idl b/offapi/com/sun/star/chart2/Diagram.idl
index e13d609..a2e6059 100644
--- a/offapi/com/sun/star/chart2/Diagram.idl
+++ b/offapi/com/sun/star/chart2/Diagram.idl
@@ -31,7 +31,7 @@
 #include <com/sun/star/chart2/XCoordinateSystemContainer.idl>
 #include <com/sun/star/chart2/XTitled.idl>
 #include <com/sun/star/chart2/RelativePosition.idl>
-#include <com/sun/star/layout/RelativeSize.idl>
+#include <com/sun/star/chart2/RelativeSize.idl>
 #include <com/sun/star/chart/X3DDefaultSetter.idl>
 
 module com
@@ -72,7 +72,7 @@ service Diagram
 
     /** The size of the diagram as relative size of the page size.
      */
-    [property] ::com::sun::star::layout::RelativeSize RelativeSize;
+    [property] ::com::sun::star::chart2::RelativeSize RelativeSize;
 
     /** The attributes RelativePosition and RelativeSize should be used for the inner coordinate region without axis labels and without data labels.
      */
diff --git a/offapi/com/sun/star/chart2/ErrorBar.idl b/offapi/com/sun/star/chart2/ErrorBar.idl
index c9f87c9..2805818 100644
--- a/offapi/com/sun/star/chart2/ErrorBar.idl
+++ b/offapi/com/sun/star/chart2/ErrorBar.idl
@@ -29,6 +29,8 @@
 
 #include <com/sun/star/drawing/LineProperties.idl>
 #include <com/sun/star/chart/ErrorBarStyle.idl>
+#include <com/sun/star/chart2/data/XDataSink.idl>
+#include <com/sun/star/chart2/data/XDataSource.idl>
 
 module com
 {
@@ -50,15 +52,16 @@ service ErrorBar
     /** allows attaching data sequences to the error bars.
         @see data::DataSequenceRole
      */
-    optional interface data::XDataSink;
+    [optional] interface data::XDataSink;
 
     /** allows querying data sequences that were set at error bars.
         @see data::DataSequenceRole
      */
     [optional] interface data::XDataSource;
     /**
+        @see ::com::sun::star::chart::ErrorBarStyle
      */
-    [property] ::com::sun::star::chart::ErrorBarStyle ErrorBarStyle;
+    [property] long ErrorBarStyle;
 
     /**
      */
diff --git a/offapi/com/sun/star/chart2/ExponentialScaling.idl b/offapi/com/sun/star/chart2/ExponentialScaling.idl
index eacf3e1..148129f 100644
--- a/offapi/com/sun/star/chart2/ExponentialScaling.idl
+++ b/offapi/com/sun/star/chart2/ExponentialScaling.idl
@@ -27,7 +27,7 @@
 #ifndef com_sun_star_chart2_ExponentialScaling_idl
 #define com_sun_star_chart2_ExponentialScaling_idl
 
-#include <com/sun/star/chart2/XScaling.idl>
+#include <com/sun/star/chart2/Scaling.idl>
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/FormattedString.idl b/offapi/com/sun/star/chart2/FormattedString.idl
index 1916425..79d232a 100644
--- a/offapi/com/sun/star/chart2/FormattedString.idl
+++ b/offapi/com/sun/star/chart2/FormattedString.idl
@@ -1,7 +1,6 @@
-#ifndef com_sun_star_chart_XFormattedString_idl
-#define com_sun_star_chart_XFormattedString_idl
+#ifndef com_sun_star_chart_FormattedString_idl
+#define com_sun_star_chart_FormattedString_idl
 
-#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/style/CharacterProperties.idl>
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
@@ -29,7 +28,7 @@ service FormattedString
 
     /**
      */
-    interface XFormattedString;
+    interface ::com::sun::star::chart2::XFormattedString;
 };
 
 } ; // chart2
diff --git a/offapi/com/sun/star/chart2/GridProperties.idl b/offapi/com/sun/star/chart2/GridProperties.idl
index dfa769b..02772b5 100644
--- a/offapi/com/sun/star/chart2/GridProperties.idl
+++ b/offapi/com/sun/star/chart2/GridProperties.idl
@@ -27,8 +27,6 @@
 #ifndef com_sun_star_chart_GridProperties_idl
 #define com_sun_star_chart_GridProperties_idl
 
-#include <com/sun/star/beans/XPropertySet.idl>
-#include <com/sun/star/chart2/XGrid.idl>
 #include <com/sun/star/drawing/LineProperties.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/Legend.idl b/offapi/com/sun/star/chart2/Legend.idl
index 6a73174..eada3b9 100644
--- a/offapi/com/sun/star/chart2/Legend.idl
+++ b/offapi/com/sun/star/chart2/Legend.idl
@@ -29,6 +29,7 @@
 
 #include <com/sun/star/chart2/XLegend.idl>
 #include <com/sun/star/chart2/LegendPosition.idl>
+#include <com/sun/star/chart2/RelativePosition.idl>
 #include <com/sun/star/chart/ChartLegendExpansion.idl>
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/drawing/LineProperties.idl>
diff --git a/offapi/com/sun/star/chart2/LinearScaling.idl b/offapi/com/sun/star/chart2/LinearScaling.idl
index a933192..97cf3c7 100644
--- a/offapi/com/sun/star/chart2/LinearScaling.idl
+++ b/offapi/com/sun/star/chart2/LinearScaling.idl
@@ -27,7 +27,7 @@
 #ifndef com_sun_star_chart2_LinearScaling_idl
 #define com_sun_star_chart2_LinearScaling_idl
 
-#include <com/sun/star/chart2/XScaling.idl>
+#include <com/sun/star/chart2/Scaling.idl>
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/LogarithmicScaling.idl b/offapi/com/sun/star/chart2/LogarithmicScaling.idl
index 231ed28..dbce87e 100644
--- a/offapi/com/sun/star/chart2/LogarithmicScaling.idl
+++ b/offapi/com/sun/star/chart2/LogarithmicScaling.idl
@@ -27,7 +27,7 @@
 #ifndef com_sun_star_chart2_LogarithmicScaling_idl
 #define com_sun_star_chart2_LogarithmicScaling_idl
 
-#include <com/sun/star/chart2/XScaling.idl>
+#include <com/sun/star/chart2/Scaling.idl>
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/PowerScaling.idl b/offapi/com/sun/star/chart2/PowerScaling.idl
index f141bb8..ed3df91 100644
--- a/offapi/com/sun/star/chart2/PowerScaling.idl
+++ b/offapi/com/sun/star/chart2/PowerScaling.idl
@@ -27,7 +27,7 @@
 #ifndef com_sun_star_chart2_PowerScaling_idl
 #define com_sun_star_chart2_PowerScaling_idl
 
-#include <com/sun/star/chart2/XScaling.idl>
+#include <com/sun/star/chart2/Scaling.idl>
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/RegressionCurveEquation.idl b/offapi/com/sun/star/chart2/RegressionCurveEquation.idl
index 9920490..2cfafd2 100644
--- a/offapi/com/sun/star/chart2/RegressionCurveEquation.idl
+++ b/offapi/com/sun/star/chart2/RegressionCurveEquation.idl
@@ -31,6 +31,7 @@
 #include <com/sun/star/drawing/LineProperties.idl>
 #include <com/sun/star/drawing/FillProperties.idl>
 #include <com/sun/star/style/CharacterProperties.idl>
+#include <com/sun/star/chart2/RelativePosition.idl>
 
 module com
 {
@@ -62,4 +63,4 @@ service RegressionCurveEquation
 } ; // sun
 } ; // star
 
-#endif
\ No newline at end of file
+#endif
diff --git a/offapi/com/sun/star/chart2/Title.idl b/offapi/com/sun/star/chart2/Title.idl
index 8afc10a..c71c8a8 100644
--- a/offapi/com/sun/star/chart2/Title.idl
+++ b/offapi/com/sun/star/chart2/Title.idl
@@ -28,11 +28,12 @@
 #define com_sun_star_chart_Title_idl
 
 #include <com/sun/star/style/ParagraphProperties.idl>
-#include <com/sun/star/layout/LayoutElement.idl>
 #include <com/sun/star/chart2/XTitle.idl>
+#include <com/sun/star/chart2/RelativePosition.idl>
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/drawing/LineProperties.idl>
 #include <com/sun/star/drawing/FillProperties.idl>
+//FIXME does not exist <com/sun/star/layout/LayoutElement.idl>
 
 module com
 {
@@ -51,7 +52,7 @@ service Title
     service                ::com::sun::star::drawing::FillProperties;
     service                ::com::sun::star::drawing::LineProperties;
     service                ::com::sun::star::beans::PropertySet;
-    [optional] service     ::com::sun::star::layout::LayoutElement;
+//FIXME    [optional] service     ::com::sun::star::layout::LayoutElement;
 
     /**
      */
diff --git a/offapi/com/sun/star/chart2/data/RangeHighlighter.idl b/offapi/com/sun/star/chart2/data/RangeHighlighter.idl
index cdf3dc6..d92a06a 100644
--- a/offapi/com/sun/star/chart2/data/RangeHighlighter.idl
+++ b/offapi/com/sun/star/chart2/data/RangeHighlighter.idl
@@ -27,7 +27,7 @@
 #ifndef com_sun_star_chart2_data_RangeHighlighter_idl
 #define com_sun_star_chart2_data_RangeHighlighter_idl
 
-#include <com/sun/star/chart2/XRangeHighlighter.idl>
+#include <com/sun/star/chart2/data/XRangeHighlighter.idl>
 
 module com
 {
diff --git a/offapi/com/sun/star/frame/XToolbarControllerListener.idl b/offapi/com/sun/star/frame/XToolbarControllerListener.idl
index 63b7b6a..c317a61 100644
--- a/offapi/com/sun/star/frame/XToolbarControllerListener.idl
+++ b/offapi/com/sun/star/frame/XToolbarControllerListener.idl
@@ -27,6 +27,8 @@
 #ifndef __com_sun_star_frame_XToolbarControllerListener_idl__
 #define __com_sun_star_frame_XToolbarControllerListener_idl__
 
+#include <com/sun/star/uno/XInterface.idl>
+
 //=============================================================================
 
  module com {  module sun {  module star {  module frame {
commit 6a7b8a6465de99c7058cfb3676f5fadbd0d8e1f1
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 21 15:24:02 2011 +0100

    offapi: css.chart2.MutableDataSequence unused, looks obsolete

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 5071213..4328206 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -434,7 +434,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c
 	LinearScaling \
 	LogarithmicScaling \
 	LogicTargetModel \
-	MutableDataSequence \
 	PowerScaling \
 	PropertyPool \
 	RegressionCurve \
diff --git a/offapi/com/sun/star/chart2/MutableDataSequence.idl b/offapi/com/sun/star/chart2/MutableDataSequence.idl
deleted file mode 100644
index 8c37c8d..0000000
--- a/offapi/com/sun/star/chart2/MutableDataSequence.idl
+++ /dev/null
@@ -1,62 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef com_sun_star_chart2_MutableDataSequence_idl
-#define com_sun_star_chart2_MutableDataSequence_idl
-
-#include <com/sun/star/chart2/DataSequence.idl>
-#include <com/sun/star/chart2/XMutableDataSequence.idl>
-
-module com
-{
-module sun
-{
-module star
-{
-module chart2
-{
-
-/**
-  */
-service MutableDataSequence
-{
-    /** provides read-access to and structural properties of the
-        underlying data.
-     */
-    service DataSequence;
-
-    /** provides write-access to the underlying data.
-     */
-    interface ::com::sun::star::chart2::XMutableDataSequence;
-};
-
-} ; // chart2
-} ; // com
-} ; // sun
-} ; // star
-
-
-#endif
commit 577943dc7b9b34a4f49a1f249d40a6e6001b1127
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 21 13:46:51 2011 +0100

    offapi: kill dmakefiles

diff --git a/offapi/com/sun/star/awt/tab/makefile.mk b/offapi/com/sun/star/awt/tab/makefile.mk
deleted file mode 100644
index 2497609..0000000
--- a/offapi/com/sun/star/awt/tab/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssawttab
-PACKAGE=com$/sun$/star$/awt$/tab
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-IDLFILES=\
-    TabPageActivatedEvent.idl\
-    XTabPageContainerListener.idl\
-    XTabPageModel.idl\
-    XTabPage.idl\
-    XTabPageContainerModel.idl\
-    XTabPageContainer.idl\
-    UnoControlTabPage.idl\
-    UnoControlTabPageModel.idl\
-    UnoControlTabPageContainer.idl\
-    UnoControlTabPageContainerModel.idl
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/document/makefile.mk b/offapi/com/sun/star/document/makefile.mk
deleted file mode 100644
index d97c508..0000000
--- a/offapi/com/sun/star/document/makefile.mk
+++ /dev/null
@@ -1,133 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssdocument
-PACKAGE=com$/sun$/star$/document
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AmbigousFilterRequest.idl\
-    BrokenPackageRequest.idl\
-    CorruptedFilterConfigurationException.idl\
-    ChangedByOthersRequest.idl\
-    DocumentEvent.idl\
-    DocumentInfo.idl\
-    DocumentProperties.idl\
-    EventDescriptor.idl\
-    EventObject.idl\
-    Events.idl\
-    ExportFilter.idl\
-    ExtendedTypeDetection.idl\
-    ExtendedTypeDetectionFactory.idl\
-    FilterAdapter.idl\
-    FilterFactory.idl\
-    FilterOptionsRequest.idl\
-    HeaderFooterSettings.idl\
-    ImportFilter.idl\
-    LinkTarget.idl\
-    LinkTargets.idl\
-    LockFileIgnoreRequest.idl\
-    LockedDocumentRequest.idl\
-    LockedOnSavingRequest.idl\
-    MacroExecMode.idl\
-    MediaDescriptor.idl\
-    NoSuchFilterRequest.idl\
-    OfficeDocument.idl\
-    OleEmbeddedServerRegistration.idl\
-    OwnLockOnDocumentRequest.idl\
-    PDFDialog.idl\
-    PrinterIndependentLayout.idl\
-    RedlineDisplayType.idl \
-    Settings.idl\
-    StandaloneDocumentInfo.idl\
-    TypeDetection.idl\
-    UpdateDocMode.idl\
-    XActionLockable.idl\
-    XBinaryStreamResolver.idl\
-    XDocumentEventBroadcaster.idl\
-    XDocumentEventListener.idl\
-    XDocumentInfo.idl\
-    XDocumentInfoSupplier.idl\
-    XDocumentInsertable.idl\
-    XDocumentProperties.idl\
-    XDocumentPropertiesSupplier.idl\
-    XDocumentRecovery.idl\
-    XDocumentSubStorageSupplier.idl\
-    XEmbeddedObjectResolver.idl\
-    XEmbeddedObjectSupplier.idl\
-    XEmbeddedObjectSupplier2.idl\
-    XEmbeddedScripts.idl\
-    XEventBroadcaster.idl\
-    XEventListener.idl\
-    XEventsSupplier.idl\
-    XExporter.idl\
-    XExtendedFilterDetection.idl\
-    XFilter.idl\
-    XFilterAdapter.idl\
-    XGraphicObjectResolver.idl\
-    XImporter.idl\
-    XInteractionFilterOptions.idl\
-    XInteractionFilterSelect.idl\
-    XLinkTargetSupplier.idl\
-    XMimeTypeInfo.idl\
-    XOOXMLDocumentPropertiesImporter.idl\
-    XRedlinesSupplier.idl \
-    XScriptInvocationContext.idl\
-    XStandaloneDocumentInfo.idl\
-    XStorageBasedDocument.idl\
-    XStorageChangeListener.idl\
-    XTypeDetection.idl\
-    XViewDataSupplier.idl\
-    LinkUpdateModes.idl\
-    XDocumentRevisionListPersistence.idl\
-    DocumentRevisionListPersistence.idl \
-    XDocumentLanguages.idl \
-    XCodeNameQuery.idl \
-    XCompatWriterDocProperties.idl \
-    XVbaMethodParameter.idl \
-    XUndoAction.idl \
-    XUndoManager.idl \
-    XUndoManagerListener.idl \
-    XUndoManagerSupplier.idl \
-    UndoManagerEvent.idl \
-    EmptyUndoStackException.idl \
-    UndoContextNotClosedException.idl \
-    UndoFailedException.idl \
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/embed/makefile.mk b/offapi/com/sun/star/embed/makefile.mk
deleted file mode 100644
index c142086..0000000
--- a/offapi/com/sun/star/embed/makefile.mk
+++ /dev/null
@@ -1,120 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssembed
-PACKAGE=com$/sun$/star$/embed
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    Actions.idl\
-    Aspects.idl\
-    BaseStorage.idl\
-    ElementModes.idl\
-    EmbedStates.idl\
-    EmbedVerbs.idl\
-    EmbedMapUnits.idl\
-    EmbedMisc.idl\
-    EmbedUpdateModes.idl\
-    EmbeddedObjectDescriptor.idl\
-    EntryInitModes.idl\
-    DocumentCloser.idl\
-    FileSystemStorage.idl\
-    FileSystemStorageFactory.idl\
-    InsertedObjectInfo.idl\
-    InstanceLocker.idl\
-    Storage.idl\
-    StorageStream.idl\
-    StorageFactory.idl\
-    StorageFormats.idl\
-    VerbAttributes.idl\
-    VisualRepresentation.idl\
-    VerbDescriptor.idl\
-    XActionsApproval.idl\
-    XPersistanceHolder.idl\
-    XEmbeddedObject.idl\
-    XVisualObject.idl\
-    XCommonEmbedPersist.idl\
-    XEmbedPersist.idl\
-    XLinkageSupport.idl\
-    XClassifiedObject.idl\
-    XInplaceObject.idl\
-    XEmbeddedClient.idl\
-    XEmbedObjectClipboardCreator.idl\
-    XEmbedObjectCreator.idl\
-    XEmbedObjectFactory.idl\
-    XLinkCreator.idl\
-    XLinkFactory.idl\
-    XEncryptionProtectedSource.idl\
-    XEncryptionProtectedSource2.idl\
-    XEncryptionProtectedStorage.idl\
-    XInplaceClient.idl\
-    XInsertObjectDialog.idl\
-    XWindowSupplier.idl\
-    XTransactedObject.idl\
-    XTransactionBroadcaster.idl\
-    XTransactionListener.idl\
-    XRelationshipAccess.idl\
-    XStateChangeBroadcaster.idl\
-    XStateChangeListener.idl\
-    XTransferableSupplier.idl\
-    XComponentSupplier.idl\
-    XStorage.idl\
-    XStorage2.idl\
-    XStorageRawAccess.idl\
-    XExtendedStorageStream.idl\
-    XHierarchicalStorageAccess.idl\
-    XHierarchicalStorageAccess2.idl\
-    XHatchWindowController.idl\
-    XHatchWindowFactory.idl\
-    XHatchWindow.idl\
-    XPackageStructureCreator.idl\
-    XOptimizedStorage.idl\
-    UnreachableStateException.idl\
-    UseBackupException.idl\
-    StateChangeInProgressException.idl\
-    WrongStateException.idl\
-    NoVisualAreaSizeException.idl\
-    ObjectSaveVetoException.idl\
-    InvalidStorageException.idl\
-    LinkageMisuseException.idl\
-    NeedsRunningStateException.idl\
-    StorageWrappedTargetException.idl\
-    OLESimpleStorage.idl\
-    XOLESimpleStorage.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/graphic/makefile.mk b/offapi/com/sun/star/graphic/makefile.mk
deleted file mode 100644
index 6e4a018..0000000
--- a/offapi/com/sun/star/graphic/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-TARGET=cssgraphic
-PACKAGE=com$/sun$/star$/graphic
-
-PRJNAME=offapi
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-#-------------------------------------------------------------------
-
-IDLFILES= \
-    Graphic.idl \
-    GraphicColorMode.idl \
-    GraphicDescriptor.idl \
-    GraphicObject.idl \
-    GraphicProvider.idl \
-    GraphicRasterizer.idl \
-    GraphicRendererVCL.idl \
-    GraphicType.idl \
-    MediaProperties.idl \
-    XPrimitive2D.idl \
-    XPrimitive3D.idl \
-    XPrimitiveFactory2D.idl \
-    XGraphic.idl \
-    XGraphicProvider.idl \
-    XGraphicRasterizer.idl \
-    XGraphicRenderer.idl \
-    XGraphicObject.idl \
-    XGraphicTransformer.idl
-    
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/rendering/makefile.mk b/offapi/com/sun/star/rendering/makefile.mk
deleted file mode 100644
index 888d0b7..0000000
--- a/offapi/com/sun/star/rendering/makefile.mk
+++ /dev/null
@@ -1,118 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssrendering
-PACKAGE=com$/sun$/star$/rendering
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AnimationAttributes.idl \
-    AnimationRepeat.idl \
-    BlendMode.idl \
-    CanvasFactory.idl \
-    Caret.idl \
-    ColorComponentTag.idl \
-    ColorProfile.idl \
-    ColorSpaceType.idl \
-    CompositeOperation.idl \
-    EmphasisMark.idl \
-    FillRule.idl \
-    FloatingPointBitmapFormat.idl \
-    FloatingPointBitmapLayout.idl \
-    FontInfo.idl \
-    FontMetrics.idl \
-    FontRequest.idl \
-    IntegerBitmapLayout.idl \
-    InterpolationMode.idl \
-    MtfRenderer.idl \
-    Panose.idl \
-    PanoseArmStyle.idl \
-    PanoseContrast.idl \
-    PanoseFamilyTypes.idl \
-    PanoseLetterForm.idl \
-    PanoseMidline.idl \
-    PanoseProportion.idl \
-    PanoseSerifStyle.idl \
-    PanoseStrokeVariation.idl \
-    PanoseWeight.idl \
-    PanoseXHeight.idl \
-    PathCapType.idl \
-    PathJoinType.idl \
-    RenderState.idl \
-    RenderingIntent.idl \
-    RepaintResult.idl \
-    StringContext.idl \
-    StrokeAttributes.idl \
-    TextDirection.idl \
-    TextHit.idl \
-    Texture.idl \
-    TexturingMode.idl \
-    ViewState.idl \
-    VolatileContentDestroyedException.idl \
-    XAnimatedSprite.idl \
-    XAnimation.idl \
-    XBezierPolyPolygon2D.idl \
-    XBitmap.idl \
-    XBitmapCanvas.idl \
-    XBitmapPalette.idl \
-    XBufferController.idl \
-    XCachedPrimitive.idl \
-    XCanvas.idl \
-    XCanvasFont.idl \
-    XColorSpace.idl \
-    XCustomSprite.idl \
-    XGraphicDevice.idl \
-    XHalfFloatBitmap.idl \
-    XHalfFloatReadOnlyBitmap.idl \
-    XIeeeDoubleBitmap.idl \
-    XIeeeDoubleReadOnlyBitmap.idl \
-    XIeeeFloatBitmap.idl \
-    XIeeeFloatReadOnlyBitmap.idl \
-    XIntegerBitmap.idl \
-    XIntegerBitmapColorSpace.idl \
-    XIntegerReadOnlyBitmap.idl \
-    XLinePolyPolygon2D.idl \
-    XParametricPolyPolygon2D.idl \
-    XPolyPolygon2D.idl \
-    XSimpleCanvas.idl \
-    XSprite.idl \
-    XSpriteCanvas.idl \
-    XTextLayout.idl \
-    XVolatileBitmap.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/script/makefile.mk b/offapi/com/sun/star/script/makefile.mk
deleted file mode 100644
index 53c95e9..0000000
--- a/offapi/com/sun/star/script/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssscript
-PACKAGE=com$/sun$/star$/script
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    DocumentDialogLibraryContainer.idl\
-    DocumentScriptLibraryContainer.idl\
-    LibraryNotLoadedException.idl\
-    XLibraryContainer.idl\
-    XLibraryContainer2.idl\
-        XLibraryContainer3.idl\
-    XLibraryContainerPassword.idl\
-    XLibraryContainerExport.idl\
-    XPersistentLibraryContainer.idl\
-    XStorageBasedLibraryContainer.idl\
-	XLibraryQueryExecutable.idl \
-    ModuleSizeExceededRequest.idl\
-    ModuleInfo.idl\
-    ModuleType.idl\
-    NativeObjectWrapper.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/script/vba/makefile.mk b/offapi/com/sun/star/script/vba/makefile.mk
deleted file mode 100644
index 6f13245..0000000
--- a/offapi/com/sun/star/script/vba/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssscriptvba
-PACKAGE=com$/sun$/star$/script$/vba
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    VBAEventId.idl \
-    VBAEventProcessor.idl \
-    VBAMacroResolver.idl \
-    VBAScriptEvent.idl \
-    VBAScriptEventId.idl \
-    VBASpreadsheetEventProcessor.idl \
-    VBATextEventProcessor.idl \
-    XVBACompatibility.idl \
-    XVBAEventProcessor.idl \
-    XVBAMacroResolver.idl \
-    XVBAModuleInfo.idl \
-    XVBAScriptListener.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/security/makefile.mk b/offapi/com/sun/star/security/makefile.mk
deleted file mode 100644
index 2064e9f..0000000
--- a/offapi/com/sun/star/security/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#i20156 - new file for xmlsecurity module
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=xsec-security
-PACKAGE=com$/sun$/star$/security
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    CertificateException.idl            \
-    CryptographyException.idl           \
-    DocumentDigitalSignatures.idl       \
-    DocumentSignatureInformation.idl   \
-    EncryptionException.idl             \
-    KeyException.idl                    \
-    NoPasswordException.idl             \
-    SecurityInfrastructureException.idl \
-    SignatureException.idl              \
-    XCertificate.idl                    \
-    CertificateCharacters.idl           \
-    CertificateValidity.idl             \
-    XCertificateExtension.idl           \
-    XDocumentDigitalSignatures.idl	\
-    KeyUsage.idl			\
-    XCertificateContainer.idl		\
-    XSerialNumberAdapter.idl		\
-    SerialNumberAdapter.idl		\
-    CertificateContainer.idl \
-    CertificateContainerStatus.idl \
-    ExtAltNameType.idl \
-    XSanExtension.idl \
-    CertAltNameEntry.idl
-    
-    
-    
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/sheet/makefile.mk b/offapi/com/sun/star/sheet/makefile.mk
deleted file mode 100644
index 26901cb..0000000
--- a/offapi/com/sun/star/sheet/makefile.mk
+++ /dev/null
@@ -1,354 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssheet
-PACKAGE=com$/sun$/star$/sheet
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AccessibleCell.idl\
-    AccessibleCsvCell.idl\
-    AccessibleCsvRuler.idl\
-    AccessibleCsvTable.idl\
-    AccessiblePageHeaderFooterAreasView.idl\
-    AccessibleSpreadsheet.idl\
-    AccessibleSpreadsheetDocumentView.idl\
-    AccessibleSpreadsheetPageView.idl\
-    ActivationEvent.idl\
-    AddressConvention.idl\
-    AddIn.idl\
-    Border.idl\
-    CellAnnotation.idl\
-    CellAnnotationShape.idl\
-    CellAnnotations.idl\
-    CellAnnotationsEnumeration.idl\
-    CellAreaLink.idl\
-    CellAreaLinks.idl\
-    CellAreaLinksEnumeration.idl\
-    CellDeleteMode.idl\
-    CellFlags.idl\
-    CellFormatRanges.idl\
-    CellFormatRangesEnumeration.idl\
-    CellInsertMode.idl\
-    Cells.idl\
-    CellsEnumeration.idl\
-    ComplexReference.idl\
-    ConditionOperator.idl\
-    ConditionOperator2.idl\
-    ConsolidationDescriptor.idl\
-    DDEItemInfo.idl\
-    DDELink.idl\
-    DDELinkInfo.idl\
-    DDELinkMode.idl\
-    DDELinks.idl\
-    DDELinksEnumeration.idl\
-    DataImportMode.idl\
-    DataPilotDescriptor.idl\
-    DataPilotField.idl\
-    DataPilotFieldAutoShowInfo.idl\
-    DataPilotFieldFilter.idl\
-    DataPilotFieldGroup.idl\
-    DataPilotFieldGroupBy.idl\
-    DataPilotFieldGroupEnumeration.idl\
-    DataPilotFieldGroupInfo.idl\
-    DataPilotFieldGroupItem.idl\
-    DataPilotFieldGroups.idl\
-    DataPilotFieldGroupsEnumeration.idl\
-    DataPilotFieldLayoutInfo.idl\
-    DataPilotFieldLayoutMode.idl\
-    DataPilotFieldOrientation.idl\
-    DataPilotFieldReference.idl\
-    DataPilotFieldReferenceItemType.idl\
-    DataPilotFieldReferenceType.idl\
-    DataPilotFieldShowItemsMode.idl\
-    DataPilotFieldSortInfo.idl\
-    DataPilotFieldSortMode.idl\
-    DataPilotFields.idl\
-    DataPilotFieldsEnumeration.idl\
-    DataPilotItem.idl\
-    DataPilotItems.idl\
-    DataPilotItemsEnumeration.idl\
-    DataPilotOutputRangeType.idl\
-    DataPilotSource.idl\
-    DataPilotSourceDimension.idl\
-    DataPilotSourceDimensions.idl\
-    DataPilotSourceHierarchies.idl\
-    DataPilotSourceHierarchy.idl\
-    DataPilotSourceLevel.idl\
-    DataPilotSourceLevels.idl\
-    DataPilotSourceMember.idl\
-    DataPilotSourceMembers.idl\
-    DataPilotTable.idl\
-    DataPilotTableHeaderData.idl\
-    DataPilotTablePositionData.idl\
-    DataPilotTablePositionType.idl\
-    DataPilotTableResultData.idl\
-    DataPilotTables.idl\
-    DataPilotTablesEnumeration.idl\
-    DataResult.idl\
-    DataResultFlags.idl\
-    DatabaseImportDescriptor.idl\
-    DatabaseRange.idl\
-    DatabaseRanges.idl\
-    DatabaseRangesEnumeration.idl\
-    DimensionFlags.idl\
-    DocumentSettings.idl\
-     ExternalDocLink.idl\
-     ExternalDocLinks.idl\
-    ExternalLinkType.idl\
-    ExternalLinkInfo.idl\
-    ExternalReference.idl\
-     ExternalSheetCache.idl\
-    FillDateMode.idl\
-    FillDirection.idl\
-    FillMode.idl\
-    FilterConnection.idl\
-    FilterFormulaParser.idl\
-    FilterOperator.idl\
-    FilterOperator2.idl\
-    FormulaLanguage.idl\
-    FormulaMapGroup.idl\
-    FormulaMapGroupSpecialOffset.idl\
-    FormulaOpCodeMapEntry.idl\
-    FormulaParser.idl\
-    FormulaResult.idl\
-    FormulaToken.idl\
-    FunctionAccess.idl\
-    FunctionArgument.idl\
-    FunctionCategory.idl\
-    FunctionDescription.idl\
-    FunctionDescriptionEnumeration.idl\
-    FunctionDescriptions.idl\
-    GeneralFunction.idl\
-    GlobalSheetSettings.idl\
-    GoalResult.idl\
-    HeaderFooterContent.idl\
-    LabelRange.idl\
-    LabelRanges.idl\
-    LabelRangesEnumeration.idl\
-    LocalizedName.idl\
-    MemberResult.idl\
-    MemberResultFlags.idl\
-    MoveDirection.idl\
-    NamedRange.idl\
-    NamedRangeFlag.idl\
-    NamedRanges.idl\
-    NamedRangesEnumeration.idl\
-    NameToken.idl\
-    NoConvergenceException.idl\
-    PasteOperation.idl\
-    RangeSelectionArguments.idl\
-    RangeSelectionEvent.idl\
-    RecentFunctions.idl\
-    ReferenceFlags.idl\
-    ResultEvent.idl\
-    Scenario.idl\
-    Scenarios.idl\
-    ScenariosEnumeration.idl\
-    Shape.idl\
-    SheetCell.idl\
-    SheetCellCursor.idl\
-    SheetCellRange.idl\
-    SheetCellRanges.idl\
-    SheetCellRangesEnumeration.idl\
-    SheetFilterDescriptor.idl\
-    SheetLink.idl\
-    SheetLinkMode.idl\
-    SheetLinks.idl\
-    SheetLinksEnumeration.idl\
-    SheetRangesQuery.idl\
-    SheetSortDescriptor.idl\
-    SheetSortDescriptor2.idl\
-    SingleReference.idl\
-    Solver.idl\
-    SolverConstraint.idl\
-    SolverConstraintOperator.idl\
-    Spreadsheet.idl\
-    SpreadsheetDocument.idl\
-    SpreadsheetDocumentSettings.idl\
-    SpreadsheetDrawPage.idl\
-    SpreadsheetView.idl\
-    SpreadsheetViewObjectsMode.idl\
-    SpreadsheetViewPane.idl\
-    SpreadsheetViewPanesEnumeration.idl\
-    SpreadsheetViewSettings.idl\
-    Spreadsheets.idl\
-    SpreadsheetsEnumeration.idl\
-    StatusBarFunction.idl\
-    SubTotalColumn.idl\
-    SubTotalDescriptor.idl\
-    SubTotalField.idl\
-    SubTotalFieldsEnumeration.idl\
-    TableAutoFormat.idl\
-    TableAutoFormatEnumeration.idl\
-    TableAutoFormatField.idl\
-    TableAutoFormats.idl\
-    TableAutoFormatsEnumeration.idl\
-    TableCellStyle.idl\
-    TableCellStyle.idl\
-    TableConditionalEntry.idl\
-    TableConditionalEntryEnumeration.idl\
-    TableConditionalFormat.idl\
-    TableFilterField.idl\
-    TableFilterField2.idl\
-    TableOperationMode.idl\
-    TablePageBreakData.idl\
-    TablePageStyle.idl\
-    TableValidation.idl\
-    TableValidationVisibility.idl\
-    UniqueCellFormatRanges.idl\
-    UniqueCellFormatRangesEnumeration.idl\
-    ValidationAlertStyle.idl\
-    ValidationType.idl\
-    VolatileResult.idl\
-    XActivationBroadcaster.idl\
-    XActivationEventListener.idl\
-    XAddIn.idl\
-    XAreaLink.idl\
-    XAreaLinks.idl\
-    XArrayFormulaRange.idl\
-    XArrayFormulaTokens.idl\
-    XCalculatable.idl\
-    XCellAddressable.idl\
-    XCellFormatRangesSupplier.idl\
-    XCellRangeAddressable.idl\
-    XCellRangeData.idl\
-    XCellRangeFormula.idl\
-    XCellRangeMovement.idl\
-    XCellRangeReferrer.idl\
-    XCellRangesAccess.idl\
-    XCellRangesQuery.idl\
-    XCellSeries.idl\
-    XCompatibilityNames.idl\
-    XConsolidatable.idl\
-    XConsolidationDescriptor.idl\
-    XDDELink.idl\
-    XDDELinkResults.idl\
-    XDDELinks.idl\
-    XDataPilotDataLayoutFieldSupplier.idl\
-    XDataPilotDescriptor.idl\
-    XDataPilotField.idl\
-    XDataPilotFieldGrouping.idl\
-    XDataPilotMemberResults.idl\
-    XDataPilotResults.idl\
-    XDataPilotTable.idl\
-    XDataPilotTable2.idl\
-    XDataPilotTables.idl\
-    XDataPilotTablesSupplier.idl\
-    XDatabaseRange.idl\
-    XDatabaseRanges.idl\
-    XDimensionsSupplier.idl\
-    XDocumentAuditing.idl\
-    XDrillDownDataSupplier.idl\
-    XEnhancedMouseClickBroadcaster.idl\
-    XExternalDocLink.idl\
-    XExternalDocLinks.idl\
-    XExternalSheetCache.idl\
-    XExternalSheetName.idl\
-    XFillAcrossSheet.idl\
-    XFilterFormulaParser.idl\
-    XFormulaOpCodeMapper.idl\
-    XFormulaParser.idl\
-    XFormulaQuery.idl\
-    XFormulaTokens.idl\
-    XFunctionAccess.idl\
-    XFunctionDescriptions.idl\
-    XGoalSeek.idl\
-    XHeaderFooterContent.idl\
-    XHierarchiesSupplier.idl\
-    XLabelRange.idl\
-    XLabelRanges.idl\
-    XLevelsSupplier.idl\
-    XMembersSupplier.idl\
-    XMultiFormulaTokens.idl\
-    XMultipleOperation.idl\
-    XNamedRange.idl\
-    XNamedRanges.idl\
-    XPrintAreas.idl\
-    XRangeSelection.idl\
-    XRangeSelectionChangeListener.idl\
-    XRangeSelectionListener.idl\
-    XRecentFunctions.idl\
-    XResultListener.idl\
-    XScenario.idl\
-    XScenarioEnhanced.idl\
-    XScenarios.idl\
-    XScenariosSupplier.idl\
-    XSheetAnnotation.idl\
-    XSheetAnnotationAnchor.idl\
-    XSheetAnnotationShapeSupplier.idl\
-    XSheetAnnotations.idl\
-    XSheetAnnotationsSupplier.idl\
-    XSheetAuditing.idl\
-    XSheetCellCursor.idl\
-    XSheetCellRange.idl\
-    XSheetCellRangeContainer.idl\
-    XSheetCellRanges.idl\
-    XSheetCondition.idl\
-    XSheetCondition2.idl\
-    XSheetConditionalEntries.idl\
-    XSheetConditionalEntry.idl\
-    XSheetFilterDescriptor.idl\
-    XSheetFilterDescriptor2.idl\
-    XSheetFilterable.idl\
-    XSheetFilterableEx.idl\
-    XSheetLinkable.idl\
-    XSheetOperation.idl\
-    XSheetOutline.idl\
-    XSheetPageBreak.idl\
-    XSheetPastable.idl\
-    XSolver.idl\
-    XSolverDescription.idl\
-    XSpreadsheet.idl\
-    XSpreadsheetDocument.idl\
-    XSpreadsheetView.idl\
-    XSpreadsheets.idl\
-    XSubTotalCalculatable.idl\
-    XSubTotalDescriptor.idl\
-    XSubTotalField.idl\
-    XUniqueCellFormatRangesSupplier.idl\
-    XUnnamedDatabaseRanges.idl\
-    XUsedAreaCursor.idl\
-    XViewFreezable.idl\
-    XViewPane.idl\
-    XViewPanesSupplier.idl\
-    XViewSplitable.idl\
-    XVolatileResult.idl\
-    _NamedRange.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/style/makefile.mk b/offapi/com/sun/star/style/makefile.mk
deleted file mode 100644
index b9077b1..0000000
--- a/offapi/com/sun/star/style/makefile.mk
+++ /dev/null
@@ -1,88 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssstyle
-PACKAGE=com$/sun$/star$/style
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    BreakType.idl\
-    CaseMap.idl\
-    CellStyle.idl\
-    CharacterProperties.idl\
-    CharacterPropertiesAsian.idl\
-    CharacterPropertiesComplex.idl\
-    CharacterStyle.idl\
-    DropCapFormat.idl\
-    FootnoteLineStyle.idl\
-    GraphicLocation.idl\
-    HorizontalAlignment.idl\
-    LineNumberPosition.idl\
-    LineSpacing.idl\
-    LineSpacingMode.idl\
-    NumberingAlignment.idl\
-    NumberingLevel.idl\
-    NumberingRule.idl\
-    NumberingType.idl\
-    PageProperties.idl\
-    PageStyle.idl\
-    PageStyleLayout.idl\
-    ParagraphAdjust.idl\
-    ParagraphProperties.idl\
-    ParagraphPropertiesAsian.idl\
-    ParagraphPropertiesComplex.idl\
-    ParagraphStyle.idl\
-    ParagraphStyleCategory.idl\
-    Style.idl\
-    StyleFamilies.idl\
-    StyleFamily.idl\
-    TabAlign.idl\
-    TabStop.idl\
-    VerticalAlignment.idl\
-    XDefaultsSupplier.idl\
-    XStyle.idl\
-    XStyleFamiliesSupplier.idl\
-    XStyleLoader.idl\
-    XStyleCondition.idl\
-    XAutoStylesSupplier.idl\
-    XAutoStyles.idl\
-    XAutoStyleFamily.idl\
-    XAutoStyle.idl
-    
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/table/makefile.mk b/offapi/com/sun/star/table/makefile.mk
deleted file mode 100644
index 4cb90ab..0000000
--- a/offapi/com/sun/star/table/makefile.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csstable
-PACKAGE=com$/sun$/star$/table
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AccessibleCellView.idl      \
-    AccessibleTableView.idl	\
-    BorderLine.idl\
-    BorderLine2.idl\
-    BorderLineStyle.idl\
-    Cell.idl\
-    CellAddress.idl\
-    CellContentType.idl\
-    CellCursor.idl\
-    CellHoriJustify.idl\
-    CellJustifyMethod.idl\
-    CellOrientation.idl\
-    CellProperties.idl\
-    CellRange.idl\
-    CellRangeAddress.idl\
-    CellVertJustify.idl\
-    CellVertJustify2.idl\
-    ShadowFormat.idl\
-    ShadowLocation.idl\
-    TableBorder.idl\
-    TableBorderDistances.idl\
-    TableChart.idl\
-    TableCharts.idl\
-    TableChartsEnumeration.idl\
-    TableColumn.idl\
-    TableColumns.idl\
-    TableColumnsEnumeration.idl\
-    TableOrientation.idl\
-    TableRow.idl\
-    TableRows.idl\
-    TableRowsEnumeration.idl\
-    TableSortDescriptor.idl\
-        TableSortDescriptor2.idl\
-        TableSortField.idl\
-        TableSortFieldType.idl\
-    XAutoFormattable.idl\
-    XCell.idl\
-    XCell2.idl\
-    XMergeableCell.idl\
-    XMergeableCellRange.idl\
-    XCellCursor.idl\
-    XCellRange.idl\
-    XColumnRowRange.idl\
-    XTableChart.idl\
-    XTableCharts.idl\
-    XTableChartsSupplier.idl\
-    XTableColumns.idl\
-    XTableRows.idl\
-    CellRangeListSource.idl\
-    CellValueBinding.idl\
-    ListPositionCellBinding.idl\
-    XTable.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xml/crypto/makefile.mk b/offapi/com/sun/star/xml/crypto/makefile.mk
deleted file mode 100644
index c03b2a7..0000000
--- a/offapi/com/sun/star/xml/crypto/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#i20156 - new file for xmlsecurity module
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=xsec-crypto
-PACKAGE=com$/sun$/star$/xml$/crypto
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XXMLSecurityTemplate.idl     \
-    XXMLSignature.idl     \
-    XXMLSignatureTemplate.idl     \
-    XXMLEncryption.idl     \
-    XXMLEncryptionTemplate.idl     \
-    XXMLSecurityContext.idl     \
-    XSecurityEnvironment.idl     \
-    XSEInitializer.idl     \
-    XMLSignature.idl     \
-    XMLSignatureTemplate.idl     \
-    XMLEncryption.idl     \
-    XMLEncryptionTemplate.idl     \
-    XMLSecurityContext.idl     \
-    SecurityEnvironment.idl     \
-    SEInitializer.idl     \
-    XMLSignatureException.idl     \
-    XMLEncryptionException.idl     \
-    XUriBinding.idl    \
-    CipherID.idl \
-    DigestID.idl \
-    XCipherContext.idl \
-    XCipherContextSupplier.idl \
-    XDigestContext.idl \
-    XDigestContextSupplier.idl \
-    SecurityOperationStatus.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
deleted file mode 100644
index 4138067..0000000
--- a/offapi/util/makefile.mk
+++ /dev/null
@@ -1,194 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-PRJPCH=
-
-PRJNAME=offapi
-TARGET=offapi_db
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  makefile.pmk
-
-# ------------------------------------------------------------------
-
-UNOIDLDBFILES= \
-    $(UCR)$/cssauth.db \
-    $(UCR)$/cssawt.db \
-    $(UCR)$/cssawttree.db \
-    $(UCR)$/cssawtgrid.db \
-    $(UCR)$/cssawttab.db \
-    $(UCR)$/csschart.db \
-    $(UCR)$/csschart2.db \
-    $(UCR)$/csschart2data.db \
-    $(UCR)$/cssconfiguration.db \
-    $(UCR)$/csscbootstrap.db\
-    $(UCR)$/csscbackend.db\
-    $(UCR)$/csscbxml.db\
-    $(UCR)$/cssdatatransfer.db \
-    $(UCR)$/cssdeployment.db \
-    $(UCR)$/cssdeploymenttest.db \
-    $(UCR)$/cssdeploymentui.db \
-    $(UCR)$/cssdclipboard.db \
-    $(UCR)$/cssddnd.db \
-    $(UCR)$/cssdocument.db \
-    $(UCR)$/cssdrawing.db \
-    $(UCR)$/cssdframework.db \
-    $(UCR)$/cssgeometry.db \
-    $(UCR)$/cssrendering.db \
-    $(UCR)$/cssembed.db \
-    $(UCR)$/cssfcontrol.db \
-    $(UCR)$/cssfinsp.db \
-    $(UCR)$/cssfrunt.db \
-    $(UCR)$/cssform.db \
-    $(UCR)$/cssxforms.db \
-    $(UCR)$/cssfcomp.db \
-    $(UCR)$/cssfbinding.db \
-    $(UCR)$/cssfvalidation.db \
-    $(UCR)$/cssfsubmission.db \
-    $(UCR)$/cssformula.db \
-    $(UCR)$/cssgraphic.db \
-    $(UCR)$/cssinstallation.db \
-    $(UCR)$/cssi18n.db \
-    $(UCR)$/cssldap.db \
-    $(UCR)$/csslinguistic2.db \
-    $(UCR)$/csslogging.db \
-    $(UCR)$/cssmail.db \
-    $(UCR)$/cssmedia.db \
-    $(UCR)$/cssmozilla.db \
-    $(UCR)$/cssoooimprovement.db \
-    $(UCR)$/csspackages.db \
-    $(UCR)$/cssmanifest.db \
-    $(UCR)$/csszippackage.db \
-    $(UCR)$/cssplugin.db \
-    $(UCR)$/csspresentation.db \
-    $(UCR)$/cssanimations.db \
-    $(UCR)$/cssresource.db \
-    $(UCR)$/csssax.db \
-    $(UCR)$/cssdom.db \
-    $(UCR)$/cssxpath.db \
-    $(UCR)$/cssdomviews.db \
-    $(UCR)$/cssdomevents.db \
-    $(UCR)$/cssscanner.db \
-    $(UCR)$/cssscript.db \
-    $(UCR)$/cssscriptvba.db \
-    $(UCR)$/csssdb.db \
-    $(UCR)$/csssdbc.db \
-    $(UCR)$/csssdbcx.db \
-    $(UCR)$/csssdbtools.db \
-    $(UCR)$/csssdbapp.db \
-    $(UCR)$/csssheet.db \
-    $(UCR)$/csssmarttags.db \
-    $(UCR)$/cssstyle.db \
-    $(UCR)$/csssystem.db\
-    $(UCR)$/csstable.db \
-    $(UCR)$/csstask.db \
-    $(UCR)$/csstext.db \
-    $(UCR)$/csstextfield.db \
-    $(UCR)$/csstextfielddocinfo.db \
-    $(UCR)$/cssfieldmaster.db \
-    $(UCR)$/cssucb.db \
-    $(UCR)$/cssutil.db \
-    $(UCR)$/cssview.db \
-    $(UCR)$/csssvg.db \
-    $(UCR)$/csssync.db \
-    $(UCR)$/csssync2.db \
-    $(UCR)$/cssxml.db \
-    $(UCR)$/cssxmlinput.db \
-    $(UCR)$/csssetup.db \
-    $(UCR)$/cssimage.db\
-    $(UCR)$/cssuidialogs.db \
-    $(UCR)$/cssui.db \
-    $(UCR)$/cssframe.db \
-    $(UCR)$/cssfstatus.db \
-    $(UCR)$/cssgraphic.db \
-    $(UCR)$/cssaccessibility.db\
-    $(UCR)$/csssprovider.db \
-    $(UCR)$/csssbrowse.db \
-    $(UCR)$/cssgallery.db \
-    $(UCR)$/cssxsd.db \
-    $(UCR)$/cssinspection.db \
-    $(UCR)$/xsec-security.db \
-    $(UCR)$/xsec-crypto.db \
-    $(UCR)$/xsec-csax.db \
-    $(UCR)$/xsec-sax.db \
-    $(UCR)$/xsec-wrapper.db \
-    $(UCR)$/cssreport.db \
-    $(UCR)$/cssrptins.db \
-    $(UCR)$/cssrptmeta.db \
-    $(UCR)$/cssoffice.db \
-    $(UCR)$/cssrdf.db
-
-
-REFERENCE_RDB=$(PRJ)$/type_reference$/types.rdb
-
-REGISTRYCHECKFLAG=$(MISC)$/registrycheck.flag
-
-UNOTYPE_STATISTICS=$(MISC)$/unotype_statistics.txt
-
-REGVIEWTOOL=$(SOLARBINDIR)$/regview
-
-# --- Targets ------------------------------------------------------
-
-ALLTAR : $(UCR)$/types.db \
-       $(OUT)$/ucrdoc$/types_doc.db \
-       $(REGISTRYCHECKFLAG) \
-       $(UNOTYPE_STATISTICS)
-
-$(UCR)$/types.db : $(UCR)$/offapi.db $(SOLARBINDIR)$/udkapi.rdb
-    @-$(RM) $(REGISTRYCHECKFLAG)
-    @$(GNUCOPY) -f $(UCR)$/offapi.db $@
-    $(COMMAND_ECHO)$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi.rdb
-
-$(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udkapi_doc.rdb
-    @-$(RM) $(REGISTRYCHECKFLAG)
-    @$(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@
-    $(COMMAND_ECHO)$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb
-
-#JSC: The type library has changed, all temporary not checked types are removed
-#     and will be check from now on.
-# ATTENTION: no special handling for types is allowed.
-#
-#JSC: i have removed the doc rdb because all type information is already in the
-#     types.rdb, even the service and singleton type info. IDL docu isn't checked.
-#
-#Use the types-whitelist to exclude published API from signalling incompatibility.
-#Handle with care.
-
-$(REGISTRYCHECKFLAG) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db types-whitelist
-# FIXME: disabled. fails without OS2 support
-#    $(COMMAND_ECHO)$(REGCOMPARE) -f -t -r1 $(REFERENCE_RDB) -r2 $(UCR)$/types.db @types-whitelist \
-#        && echo > $(REGISTRYCHECKFLAG)

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list