[Libreoffice-commits] .: 4 commits - chart2/Library_chartcontroller.mk chart2/Library_chartmodel.mk chart2/Library_charttools.mk chart2/Library_chartview.mk chart2/prj sccomp/prj sc/CppunitTest_sc_ucalc.mk sc/inc sc/Library_scd.mk sc/Library_scfilt.mk sc/Library_sc.mk sc/Library_scui.mk sc/Library_vbaobj.mk

David Tardon dtardon at kemper.freedesktop.org
Sat Jun 18 02:32:12 PDT 2011 

 chart2/Library_chartcontroller.mk |    6 +
 chart2/Library_chartmodel.mk      |    6 +
 chart2/Library_charttools.mk      |    6 +
 chart2/Library_chartview.mk       |    6 +
 chart2/prj/build.lst              |    2 
 sc/CppunitTest_sc_ucalc.mk        |    6 +
 sc/Library_sc.mk                  |    6 +
 sc/Library_scd.mk                 |    6 +
 sc/Library_scfilt.mk              |    6 +
 sc/Library_scui.mk                |    6 +
 sc/Library_vbaobj.mk              |    7 +
 sc/inc/pch/precompiled_sc.hxx     |  146 +++++++++++++++++++-------------------
 sccomp/prj/build.lst              |    2 
 13 files changed, 126 insertions(+), 85 deletions(-)

New commits:
commit cffaf208860b90d79988f4f1cf59622d9f7f5da0
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jun 1 18:05:07 2011 +0200

    needs oovbaapi too

diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 3c3b541..2651c96 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_set_defs,vbaobj,\
 
 $(eval $(call gb_Library_add_api,vbaobj,\
     offapi \
+    oovbaapi \
     udkapi \
 ))
 
commit c774dc0bbcfa032523957a7672995fde32924885
Author: David Tardon <dtardon at redhat.com>
Date:   Mon May 30 18:47:52 2011 +0200

    remove all traces of offuh from makefiles

diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index b717c2d..090d3ea 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -35,7 +35,11 @@ $(eval $(call gb_Library_set_include,chartcontroller,\
     -I$(realpath $(SRCDIR)/chart2/source/controller/inc) \
     -I$(realpath $(SRCDIR)/chart2/source/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,chartcontroller,\
+    offapi \
+    udkapi \
 ))
 
 # TODO: is this still necessary?
diff --git a/chart2/Library_chartmodel.mk b/chart2/Library_chartmodel.mk
index cf25873..e9ac455 100644
--- a/chart2/Library_chartmodel.mk
+++ b/chart2/Library_chartmodel.mk
@@ -35,7 +35,11 @@ $(eval $(call gb_Library_set_include,chartmodel,\
     -I$(realpath $(SRCDIR)/chart2/source/model/inc) \
     -I$(realpath $(SRCDIR)/chart2/source/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,chartmodel,\
+    offapi \
+    udkapi \
 ))
 
 # TODO: is this still necessary?
diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk
index 2bf40ca..9eac639 100644
--- a/chart2/Library_charttools.mk
+++ b/chart2/Library_charttools.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,charttools,\
     -I$(realpath $(SRCDIR)/chart2/inc/pch) \
     -I$(realpath $(SRCDIR)/chart2/source/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,charttools,\
@@ -42,6 +41,11 @@ $(eval $(call gb_Library_set_defs,charttools,\
     -DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
 ))
 
+$(eval $(call gb_Library_add_api,charttools,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,charttools,\
     basegfx \
     comphelper \
diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk
index 802a13d..9fc0e50 100644
--- a/chart2/Library_chartview.mk
+++ b/chart2/Library_chartview.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,chartview,\
     -I$(realpath $(SRCDIR)/chart2/source/view/inc) \
     -I$(realpath $(SRCDIR)/chart2/source/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,chartview,\
@@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,chartview,\
     -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
 ))
 
+$(eval $(call gb_Library_add_api,chartview,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,chartview,\
     basegfx \
     charttools \
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index ec8db65..26b483b 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -71,10 +71,14 @@ $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\
     -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
     -I$(realpath $(SRCDIR)/sc/inc) \
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
 
+$(eval $(call gb_CppunitTest_add_api,sc_ucalc,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_CppunitTest_uses_ure,sc_ucalc))
 
 $(eval $(call gb_CppunitTest_add_type_rdbs,sc_ucalc,\
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 5e93753..3b82fd0 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,sc,\
         -I$(WORKDIR)/SdiTarget/sc/sdi \
         -I$(WORKDIR)/Misc/sc/ \
         $$(INCLUDE) \
-        -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,sc,\
@@ -45,6 +44,11 @@ $(eval $(call gb_Library_set_defs,sc,\
         -DSC_INFO_OSVERSION=\"$(OS)\" \
 ))
 
+$(eval $(call gb_Library_add_api,sc,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,sc,\
         avmedia \
         basegfx \
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
index 0331df2..5b4aa84 100644
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@ -30,13 +30,17 @@ $(eval $(call gb_Library_set_include,scd,\
         -I$(realpath $(SRCDIR)/sc/inc) \
         -I$(WORKDIR)/Misc/sc/ \
         $$(INCLUDE) \
-        -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,scd,\
         $$(DEFS) \
 ))
 
+$(eval $(call gb_Library_add_api,scd,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,scd,\
         cppu \
         cppuhelper \
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index edcfd7c..04e6dba 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,scfilt,\
         -I$(realpath $(SRCDIR)/sc/inc/pch) \
         -I$(WORKDIR)/Misc/sc/ \
         $$(INCLUDE) \
-        -I$(OUTDIR)/inc/offuh \
         -I$(OUTDIR)/inc \
 ))
 
@@ -41,6 +40,11 @@ $(eval $(call gb_Library_set_defs,scfilt,\
         $$(DEFS) \
 ))
 
+$(eval $(call gb_Library_add_api,scfilt,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,scfilt,\
         basegfx \
         comphelper \
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index c85de9f..ce806b4 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -30,13 +30,17 @@ $(eval $(call gb_Library_set_include,scui,\
 	-I$(WORKDIR)/SdiTarget/sc/sdi \
 	-I$(WORKDIR)/Misc/sc \
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,scui,\
 	$$(DEFS) \
 ))
 
+$(eval $(call gb_Library_add_api,scui,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,scui,\
 	comphelper \
 	cppu \
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 6ef54b3..3c3b541 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_set_include,vbaobj,\
 	-I$(realpath $(SRCDIR)/sc/inc) \
 	-I$(WORKDIR)/Misc/sc/ \
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/offuh \
 	-I$(OUTDIR)/inc/ \
 ))
 
@@ -40,6 +39,11 @@ $(eval $(call gb_Library_set_defs,vbaobj,\
 	-DVBA_OOBUILD_HACK \
 ))
 
+$(eval $(call gb_Library_add_api,vbaobj,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,vbaobj,\
 	comphelper \
 	cppu \
commit 72c2bee06aa857bba044fbb5c308a5d8a54d58f5
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date:   Mon May 30 18:17:06 2011 +0200

    ause130: #i117218# fix broken pch file

diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 41eae62..5d26512 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -65,79 +65,79 @@
 #include <cwchar>
 #include <float.h>
 #include <functional>
-#include <offuh/com/sun/star/awt/Point.hdl>
-#include <offuh/com/sun/star/awt/Point.hpp>
-#include <offuh/com/sun/star/awt/Size.hdl>
-#include <offuh/com/sun/star/awt/Size.hpp>
-#include <offuh/com/sun/star/beans/PropertyVetoException.hdl>
-#include <offuh/com/sun/star/beans/PropertyVetoException.hpp>
-#include <offuh/com/sun/star/container/ElementExistException.hdl>
-#include <offuh/com/sun/star/container/ElementExistException.hpp>
-#include <offuh/com/sun/star/container/NoSuchElementException.hpp>
-#include <offuh/com/sun/star/container/XElementAccess.hdl>
-#include <offuh/com/sun/star/container/XElementAccess.hpp>
-#include <offuh/com/sun/star/container/XNameAccess.hpp>
-#include <offuh/com/sun/star/datatransfer/DataFlavor.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DragGestureEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DragSourceDragEvent.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DragSourceDragEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DragSourceDropEvent.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DragSourceEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetDragEvent.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetEvent.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/DropTargetEvent.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragGestureListener.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSource.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSource.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSourceContext.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSourceListener.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
-#include <offuh/com/sun/star/datatransfer/dnd/XDropTargetListener.hdl>
-#include <offuh/com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#include <offuh/com/sun/star/datatransfer/UnsupportedFlavorException.hdl>
-#include <offuh/com/sun/star/datatransfer/XTransferable.hpp>
-#include <offuh/com/sun/star/drawing/XShape.hpp>
-#include <offuh/com/sun/star/embed/InvalidStorageException.hpp>
-#include <offuh/com/sun/star/embed/StorageWrappedTargetException.hdl>
-#include <offuh/com/sun/star/embed/StorageWrappedTargetException.hpp>
-#include <offuh/com/sun/star/embed/XStorage.hdl>
-#include <offuh/com/sun/star/embed/XStorage.hpp>
-#include <offuh/com/sun/star/io/BufferSizeExceededException.hpp>
-#include <offuh/com/sun/star/io/IOException.hdl>
-#include <offuh/com/sun/star/io/NotConnectedException.hdl>
-#include <offuh/com/sun/star/io/NotConnectedException.hpp>
-#include <offuh/com/sun/star/io/XInputStream.hdl>
-#include <offuh/com/sun/star/io/XInputStream.hpp>
-#include <offuh/com/sun/star/io/XOutputStream.hdl>
-#include <offuh/com/sun/star/io/XOutputStream.hpp>
-#include <offuh/com/sun/star/io/XStream.hdl>
-#include <offuh/com/sun/star/lang/EventObject.hdl>
-#include <offuh/com/sun/star/lang/IllegalArgumentException.hpp>
-#include <offuh/com/sun/star/lang/WrappedTargetException.hdl>
-#include <offuh/com/sun/star/lang/WrappedTargetException.hpp>
-#include <offuh/com/sun/star/lang/XComponent.hpp>
-#include <offuh/com/sun/star/lang/XEventListener.hpp>
-#include <offuh/com/sun/star/packages/NoEncryptionException.hdl>
-#include <offuh/com/sun/star/packages/NoEncryptionException.hpp>
-#include <offuh/com/sun/star/packages/WrongPasswordException.hdl>
-#include <offuh/com/sun/star/packages/WrongPasswordException.hpp>
-#include <offuh/com/sun/star/uno/Exception.hdl>
-#include <offuh/com/sun/star/uno/Exception.hpp>
-#include <offuh/com/sun/star/uno/RuntimeException.hdl>
-#include <offuh/com/sun/star/uno/RuntimeException.hpp>
-#include <offuh/com/sun/star/uno/XAdapter.hdl>
-#include <offuh/com/sun/star/uno/XAdapter.hpp>
-#include <offuh/com/sun/star/uno/XInterface.hdl>
-#include <offuh/com/sun/star/uno/XReference.hdl>
-#include <offuh/com/sun/star/uno/XReference.hpp>
-#include <offuh/com/sun/star/uno/XWeak.hpp>
+#include <com/sun/star/awt/Point.hdl>
+#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/awt/Size.hdl>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/beans/PropertyVetoException.hdl>
+#include <com/sun/star/beans/PropertyVetoException.hpp>
+#include <com/sun/star/container/ElementExistException.hdl>
+#include <com/sun/star/container/ElementExistException.hpp>
+#include <com/sun/star/container/NoSuchElementException.hpp>
+#include <com/sun/star/container/XElementAccess.hdl>
+#include <com/sun/star/container/XElementAccess.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/datatransfer/DataFlavor.hdl>
+#include <com/sun/star/datatransfer/dnd/DragGestureEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DragSourceDragEvent.hdl>
+#include <com/sun/star/datatransfer/dnd/DragSourceDragEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DragSourceDropEvent.hdl>
+#include <com/sun/star/datatransfer/dnd/DragSourceEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hdl>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hdl>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetEvent.hdl>
+#include <com/sun/star/datatransfer/dnd/DropTargetEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hdl>
+#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragSource.hdl>
+#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hdl>
+#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hdl>
+#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hdl>
+#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
+#include <com/sun/star/datatransfer/UnsupportedFlavorException.hdl>
+#include <com/sun/star/datatransfer/XTransferable.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/embed/InvalidStorageException.hpp>
+#include <com/sun/star/embed/StorageWrappedTargetException.hdl>
+#include <com/sun/star/embed/StorageWrappedTargetException.hpp>
+#include <com/sun/star/embed/XStorage.hdl>
+#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/io/BufferSizeExceededException.hpp>
+#include <com/sun/star/io/IOException.hdl>
+#include <com/sun/star/io/NotConnectedException.hdl>
+#include <com/sun/star/io/NotConnectedException.hpp>
+#include <com/sun/star/io/XInputStream.hdl>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XOutputStream.hdl>
+#include <com/sun/star/io/XOutputStream.hpp>
+#include <com/sun/star/io/XStream.hdl>
+#include <com/sun/star/lang/EventObject.hdl>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/lang/WrappedTargetException.hdl>
+#include <com/sun/star/lang/WrappedTargetException.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/packages/NoEncryptionException.hdl>
+#include <com/sun/star/packages/NoEncryptionException.hpp>
+#include <com/sun/star/packages/WrongPasswordException.hdl>
+#include <com/sun/star/packages/WrongPasswordException.hpp>
+#include <com/sun/star/uno/Exception.hdl>
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/RuntimeException.hdl>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/XAdapter.hdl>
+#include <com/sun/star/uno/XAdapter.hpp>
+#include <com/sun/star/uno/XInterface.hdl>
+#include <com/sun/star/uno/XReference.hdl>
+#include <com/sun/star/uno/XReference.hpp>
+#include <com/sun/star/uno/XWeak.hpp>
 #include <osl/endian.h>
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>
commit 6b83ec962ae51bf140ae54bd0db84851c0d6bad5
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date:   Mon May 30 18:05:10 2011 +0200

    ause130: #i117218# change .idl handling to gnu make

diff --git a/chart2/prj/build.lst b/chart2/prj/build.lst
index ac33815..c21ce8f 100644
--- a/chart2/prj/build.lst
+++ b/chart2/prj/build.lst
@@ -1,3 +1,3 @@
-ch	chart2	:    offapi offuh TRANSLATIONS:translations comphelper cppu cppuhelper sal svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL
+ch	chart2	:    offapi TRANSLATIONS:translations comphelper cppu cppuhelper sal svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL
 ch	chart2										usr1	-	all	ch_mkout NULL
 ch	chart2\prj									nmake	-	all	ch_prj NULL
diff --git a/sccomp/prj/build.lst b/sccomp/prj/build.lst
index 865c558..31d12ac 100644
--- a/sccomp/prj/build.lst
+++ b/sccomp/prj/build.lst
@@ -1,4 +1,4 @@
-scc	sccomp	:    TRANSLATIONS:translations offuh comphelper LPSOLVE:lpsolve tools DESKTOP:rsc LIBXSLT:libxslt NULL
+scc	sccomp	:    TRANSLATIONS:translations offapi comphelper LPSOLVE:lpsolve tools DESKTOP:rsc LIBXSLT:libxslt NULL
 scc	sccomp									usr1	-	all	scc_mkout NULL
 scc	sccomp\prj								get		-	all	scc_prj NULL
 scc	sccomp\source\solver					nmake	-	all	scc_solver NULL

More information about the Libreoffice-commits mailing list