[Libreoffice-commits] .: Branch 'feature/vos-removal' - 2 commits - chart2/workbench scaddins/source sc/inc sc/source sc/util sc/workben

[Norbert Thiebaud]

 chart2/workbench/addin/makefile.mk |    3 +--
 sc/inc/pch/precompiled_sc.hxx      |    3 ---
 sc/source/core/tool/addincol.cxx   |    1 -
 sc/source/filter/inc/filt_pch.hxx  |    4 ----
 sc/source/filter/xml/xmlwrap.cxx   |    1 -
 sc/util/makefile.mk                |    2 --
 sc/workben/makefile.mk             |    2 +-
 scaddins/source/datefunc/msdev.mk  |    1 -
 8 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 540f981da17997c2dc712d37a26a3c993bcf8516
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 21 16:26:15 2010 -0500

    Finally, gut the vos module out of the build

diff --git a/chart2/workbench/addin/makefile.mk b/chart2/workbench/addin/makefile.mk
index 2a7ebd1..380a0ce 100644
--- a/chart2/workbench/addin/makefile.mk
+++ b/chart2/workbench/addin/makefile.mk
@@ -73,8 +73,7 @@ SHL1OBJS=$(SLOFILES)
 SHL1STDLIBS= \
         $(CPPUHELPERLIB)	\
         $(CPPULIB)			\
-        $(VOSLIB)			\
-        $(SALLIB) 
+        $(SALLIB)
 
 SHL1DEPN=makefile.mk
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index c6c2abc..5b9c165 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -86,7 +86,6 @@ SHL1STDLIBS=       \
     $(COMPHELPERLIB)	\
     $(UCBHELPERLIB)	\
     $(TKLIB)		\
-    $(VOSLIB)		\
     $(SALLIB)		\
     $(SALHELPERLIB)		\
     $(TOOLSLIB)	\
@@ -193,7 +192,6 @@ SHL6STDLIBS= \
     $(CPPUHELPERLIB)	\
     $(COMPHELPERLIB)	\
     $(TKLIB)		\
-    $(VOSLIB)		\
     $(SALLIB)		\
     $(TOOLSLIB)	\
     $(UNOTOOLSLIB) \
diff --git a/sc/workben/makefile.mk b/sc/workben/makefile.mk
index 08d09a6..ba5ebbb 100644
--- a/sc/workben/makefile.mk
+++ b/sc/workben/makefile.mk
@@ -68,7 +68,7 @@ EXCEPTIONSFILES= \
 
 SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
 
-SHL1STDLIBS=$(VCLLIB) $(TOOLSLIB) $(SVLLIB) $(TKLIB) $(SALLIB) $(VOSLIB) $(CPPULIB) $(CPPUHELPERLIB)
+SHL1STDLIBS=$(VCLLIB) $(TOOLSLIB) $(SVLLIB) $(TKLIB) $(SALLIB)  $(CPPULIB) $(CPPUHELPERLIB)
 
 SHL1DEPN=   $(L)$/itools.lib $(SVLIBDEPEND)
 SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
diff --git a/scaddins/source/datefunc/msdev.mk b/scaddins/source/datefunc/msdev.mk
index d50fb23..3f99d2e 100644
--- a/scaddins/source/datefunc/msdev.mk
+++ b/scaddins/source/datefunc/msdev.mk
@@ -40,7 +40,6 @@ PROJECT=datefunc
 TARGET=$(BINOUT)\datefunc.dll
 
 CPPFLAGS = \
-    -I$(RUNTIME)\vos\inc		\
     -I$(RUNTIME)\sal\inc		\
     -I$(RUNTIME)\cppu\inc		\
     -I$(RUNTIME)\cppuhelper\inc	\
commit 92a001b56330f764c0fce0435570f7629423dc55
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 21 15:38:36 2010 -0500

    remvove vos/macros.h usage

diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 0b69bf5..6ec1eb3 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -236,9 +236,6 @@
 #include <vcl/vclevent.hxx>
 #include <vcl/window.hxx>
 #include <vcl/wintypes.hxx>
-#include <vos/macros.hxx>
-#include <vos/object.hxx>
-#include <vos/types.hxx>
 #include <wchar.h>
 
 #endif
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 10e2438..9728e00 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -35,7 +35,6 @@
 #include <tools/debug.hxx>
 #include <i18npool/mslangid.hxx>
 #include <vcl/svapp.hxx>
-#include <vos/xception.hxx>
 #include <sfx2/objsh.hxx>
 #include <unotools/charclass.hxx>
 
diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx
index 1fc2fdb..9ce3ce9 100644
--- a/sc/source/filter/inc/filt_pch.hxx
+++ b/sc/source/filter/inc/filt_pch.hxx
@@ -155,9 +155,6 @@
 #include <tools/shl.hxx>
 #include <tools/pstm.hxx>
 #include <editeng/fhgtitem.hxx>
-#include <vos/types.hxx>
-#include <vos/object.hxx>
-#include <vos/macros.hxx>
 #include <tools/unqid.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <uno/sequence2.h>
@@ -221,7 +218,6 @@
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <vcl/svapp.hxx>
 #include <osl/thread.hxx>
-#include <vos/runnable.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 #include <vcl/apptypes.hxx>
 #include <editeng/editdata.hxx>
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 880a147..de75372 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -37,7 +37,6 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
 #include <tools/debug.hxx>
-#include <vos/xception.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
 #include <svx/xmlgrhlp.hxx>